feat: 热搜词跳转直播

.github/workflows/beta_ci.yml

@@ -1,209 +0,0 @@
-name: Pilipala Beta
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "never"
-    paths-ignore:
-      - "**.md"
-      - "**.txt"
-      - ".github/**"
-      - ".idea/**"
-      - "!.github/workflows/**"
-
-
-jobs:
-  update_version:
-    name: Read and update version
-    runs-on: ubuntu-latest
-
-    outputs:
-      # 定义输出变量 version，以便在其他job中引用
-      new_version: ${{ steps.version.outputs.new_version }}
-      last_commit: ${{ steps.get-last-commit.outputs.last_commit }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-          fetch-depth: 0
-
-      - name: 获取first parent commit次数
-        id: get-first-parent-commit-count
-        run: |
-          version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true)
-          if [[ "x$recent_release_tag" == "x" ]]; then
-            echo "当前版本tag不存在，请手动生成tag."
-            exit 1
-          fi
-          git log --oneline --first-parent $recent_release_tag..HEAD
-          first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD)
-          echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT
-
-      - name: 获取最后一次提交
-        id: get-last-commit
-        run: |
-          last_commit=$(git log -1 --pretty="%h %s" --first-parent)
-          echo "last_commit=$last_commit" >> $GITHUB_OUTPUT
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 读取版本号
-          VERSION=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-
-          # 获取GitHub Actions的run_number
-          #RUN_NUMBER=${{ github.run_number }}
-
-          # 构建新版本号
-          NEW_VERSION=$VERSION-beta.${{ steps.get-first-parent-commit-count.outputs.count }}
-
-          # 输出新版本号
-          echo "New version: $NEW_VERSION"
-
-          # 设置新版本号为输出变量
-          echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT
-
-  android:
-    name: Build CI (Android)
-    needs: update_version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-
-      - 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
-          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.5
-          channel: any
-
-      - name: 下载项目依赖
-        run: flutter pub get
-
-      - name: 解码生成 jks
-        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
-        env:
-          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
-
-      - 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: 重命名应用
-        run: |
-          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]}v${{ needs.update_version.outputs.new_version }}.apk"
-              mv "$file" "$new_file_name"
-            fi
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          name: Pilipala-Beta
-          path: |
-            build/app/outputs/flutter-apk/Pili-*.apk
-
-  iOS:
-    name: Build CI (iOS)
-    needs: update_version
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-
-      - 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: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "" "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
-
-      - 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: 重命名应用
-        run: |
-          DATE=${{ steps.date.outputs.date }}
-          for file in app.ipa; do
-            new_file_name="build/Pili-v${{ needs.update_version.outputs.new_version }}.ipa"
-            mv "$file" "$new_file_name"
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          if-no-files-found: error
-          name: Pilipala-Beta
-          path: |
-            build/Pili-*.ipa
-
-  upload:
-    runs-on: ubuntu-latest
-
-    needs:
-      - update_version
-      - android
-      - iOS
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: Pilipala-Beta
-          path: ./Pilipala-Beta
-
-      - name: 发送到Telegram频道
-        uses: xireiki/channel-post@v1.0.7
-        with:
-          bot_token: ${{ secrets.BOT_TOKEN }}
-          chat_id: ${{ secrets.CHAT_ID }}
-          large_file: true
-          api_id: ${{ secrets.TELEGRAM_API_ID }}
-          api_hash: ${{ secrets.TELEGRAM_API_HASH }}
-          method: sendFile
-          path: Pilipala-Beta/*
-          parse_mode: Markdown
-          context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}]"

README.md

@@ -26,13 +26,13 @@
 Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 
 ```bash
-[✓] Flutter (Channel stable, 3.16.5, on macOS 14.1.2 23B92 darwin-arm64, locale
+[✓] Flutter (Channel stable, 3.16.4, on macOS 14.1.2 23B92 darwin-arm64, locale
     zh-Hans-CN)
 [✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
 [✓] Xcode - develop for iOS and macOS (Xcode 15.1)
 [✓] Chrome - develop for the web
 [✓] Android Studio (version 2022.3)
-[✓] VS Code (version 1.87.2)
+[✓] VS Code (version 1.85.1)
 [✓] Connected device (3 available)
 [✓] Network resources
 
@@ -44,9 +44,6 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 ## 技术交流
 
 Telegram: https://t.me/+lm_oOVmF0RJiODk1
-
-Tg Beta版本：@PiliPala_Beta
-
 QQ频道: https://pd.qq.com/s/365esodk3
 
 
@@ -94,7 +91,7 @@ QQ频道: https://pd.qq.com/s/365esodk3
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
   - [x] 弹幕
-  - [x] 字幕
+  - [ ] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等
      

android/app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
         android:fullBackupContent="false"
         tools:replace="android:allowBackup">
         <activity
-            android:name="com.guozhigq.pilipala.MainActivity"
+            android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
@@ -223,10 +223,6 @@
                     android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/video/.*" />
-                <data android:scheme="https" android:host="b23.tv"
-                    android:pathPattern="/*" />
-                <data android:scheme="https" android:host="space.bilibili.com"
-                    android:pathPattern="/*" />
 
             </intent-filter>
         </activity>

android/app/src/main/kotlin/com/guozhigq/pilipala/MainActivity.kt

@@ -1,8 +1,6 @@
 package com.guozhigq.pilipala
 
-// import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterActivity
-import com.ryanheise.audioservice.AudioServiceActivity;
-
-class MainActivity: AudioServiceActivity() {
 
+class MainActivity: FlutterActivity() {
 }

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()

assets/images/video/danmu_close.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-pointer="none" viewBox="0 0 24 24"><path fill-rule="evenodd" d="m8.085 4.891-.999-1.499a1.008 1.008 0 0 1 1.679-1.118l1.709 2.566c.54-.008 1.045-.012 1.515-.012h.13c.345 0 .707.003 1.088.007l1.862-2.59a1.008 1.008 0 0 1 1.637 1.177l-1.049 1.46c.788.02 1.631.046 2.53.078 1.958.069 3.468 1.6 3.74 3.507.088.613.13 2.158.16 3.276l.001.027c.01.333.017.63.025.856a.987.987 0 0 1-1.974.069c-.008-.23-.016-.539-.025-.881v-.002c-.028-1.103-.066-2.541-.142-3.065-.143-1.004-.895-1.78-1.854-1.813-2.444-.087-4.466-.13-6.064-.131-1.598 0-3.619.044-6.063.13a2.037 2.037 0 0 0-1.945 1.748c-.15 1.04-.225 2.341-.225 3.904 0 1.874.11 3.474.325 4.798.154.949.95 1.66 1.91 1.708a97.58 97.58 0 0 0 5.416.139.988.988 0 0 1 0 1.975c-2.196 0-3.61-.047-5.513-.141A4.012 4.012 0 0 1 2.197 17.7c-.236-1.446-.351-3.151-.351-5.116 0-1.64.08-3.035.245-4.184A4.013 4.013 0 0 1 5.92 4.96c.761-.027 1.483-.05 2.164-.069Zm4.436 4.707h-1.32v4.63h2.222v.848h-2.618v1.078h2.431a5.01 5.01 0 0 1 3.575-3.115V9.598h-1.276a8.59 8.59 0 0 0 .748-1.42l-1.089-.384a14.232 14.232 0 0 1-.814 1.804h-1.518l.693-.308a8.862 8.862 0 0 0-.814-1.408l-1.045.352c.297.396.572.847.825 1.364Zm-4.18 3.564.154-1.485h1.98V8.289h-3.2v.979h2.067v1.43H7.483l-.308 3.454h2.277c0 1.166-.044 1.925-.12 2.277-.078.352-.386.528-.936.528-.308 0-.616-.022-.902-.055l.297 1.067.062.004c.285.02.551.04.818.04 1.001-.066 1.562-.418 1.694-1.056.11-.638.176-1.903.176-3.795h-2.2Zm7.458.11v-.858h-1.254v.858H15.8Zm-2.376-.858v.858h-1.199v-.858h1.2Zm-1.199-.946h1.2v-.902h-1.2v.902Zm2.321 0v-.902H15.8v.902h-1.254Zm3.517 10.594a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm-.002-1.502a2.5 2.5 0 0 1-2.217-3.657l3.326 3.398a2.49 2.49 0 0 1-1.109.259Zm2.5-2.5c0 .42-.103.815-.286 1.162l-3.328-3.401a2.5 2.5 0 0 1 3.614 2.239Z" clip-rule="evenodd"></path></svg>

assets/images/video/danmu_open.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-pointer="none" viewBox="0 0 24 24" id="svgcontent" overflow="visible" width="24" height="24" x="597" y="286"><g class="layer" style="pointer-events:all"><title style="pointer-events:inherit">Layer 1</title><path fill-rule="evenodd" d="M11.99,4.83C11.52,4.83 11.01,4.83 10.47,4.84L8.76,2.27A1.01,1.01 0 0 0 7.09,3.39L8.08,4.89C7.4,4.91 6.68,4.93 5.92,4.96A4.01,4.01 0 0 0 2.09,8.4C1.93,9.55 1.85,10.94 1.85,12.58C1.85,14.55 1.96,16.25 2.2,17.7A4.01,4.01 0 0 0 5.96,21.06L6.86,21.11C8.07,21.17 8.67,21.2 10.47,21.2A0.99,0.99 0 0 0 10.47,19.23C8.71,19.23 8.13,19.2 6.97,19.14L6.06,19.09A2.04,2.04 0 0 1 4.15,17.38C3.93,16.06 3.82,14.46 3.82,12.58C3.82,11.02 3.9,9.72 4.05,8.68C4.19,7.7 5.01,6.97 5.99,6.93C8.43,6.85 10.46,6.8 12.05,6.8C13.65,6.8 15.67,6.85 18.12,6.93C19.08,6.97 19.83,7.74 19.97,8.75C20.05,9.27 20.09,10.71 20.11,11.81L20.11,11.81C20.12,12.16 20.13,12.46 20.14,12.69A0.99,0.99 0 1 0 22.11,12.63C22.1,12.4 22.1,12.1 22.09,11.77L22.09,11.74C22.06,10.62 22.01,9.08 21.93,8.47C21.65,6.56 20.14,5.03 18.19,4.96C17.29,4.93 16.44,4.9 15.66,4.88L16.71,3.42A1.01,1.01 0 0 0 15.07,2.24L13.21,4.83C12.83,4.83 12.46,4.83 12.12,4.83L11.99,4.83zM12.51,9.6L11.19,9.6L11.19,14.23L13.41,14.23L13.41,15.08L10.79,15.08L10.79,16.16L13.41,16.16L13.42,16.84C13.78,16.86 14.13,17 14.43,17.24L14.54,17.24L14.54,16.16L17.23,16.16L17.23,15.08L14.53,15.08L14.53,14.23L16.8,14.23L16.8,9.6L15.52,9.6A8.59,8.59 0 0 0 16.27,8.18L15.18,7.8A14.23,14.23 0 0 1 14.37,9.6L12.85,9.6L13.54,9.3A8.86,8.86 0 0 0 12.73,7.89L11.68,8.24C11.98,8.64 12.26,9.09 12.51,9.6zM8.33,13.17L8.48,11.68L10.46,11.68L10.46,8.29L7.26,8.29L7.26,9.27L9.33,9.27L9.33,10.7L7.47,10.7L7.16,14.16L9.44,14.16C9.44,15.32 9.4,16.08 9.32,16.43C9.24,16.79 8.94,16.96 8.39,16.96C8.08,16.96 7.77,16.94 7.48,16.91L7.78,17.97L7.84,17.98C8.13,18 8.39,18.02 8.66,18.02C9.66,17.95 10.22,17.6 10.35,16.96C10.46,16.32 10.53,15.06 10.53,13.17L8.33,13.17zM15.79,13.28L15.79,12.42L14.53,12.42L14.53,13.28L15.79,13.28zM13.41,12.42L13.41,13.28L12.21,13.28L12.21,12.42L13.41,12.42zM12.21,11.47L13.41,11.47L13.41,10.57L12.21,10.57L12.21,11.47zM14.53,11.47L14.53,10.57L15.79,10.57L15.79,11.47L14.53,11.47z" clip-rule="evenodd" id="svg_1"></path><path fill="#000000" fill-rule="evenodd" d="M22.85,14.63A1,1 0 0 0 21.43,14.7L16.34,20.41L14.13,18.13L14.03,18.04L14.02,18.04A1,1 0 0 0 12.7,19.53L15.66,22.57L15.76,22.66L15.76,22.66C16.17,22.98 16.76,22.93 17.12,22.54L22.93,16.03L23.01,15.93L23.01,15.92A1,1 0 0 0 22.85,14.63z" clip-rule="evenodd" id="svg_2"></path></g></svg>

change_log/1.0.20.0303.md

@@ -1,31 +0,0 @@
-## 1.0.20
-
-
-### 功能
-+ 评论区增加表情
-+ 首页渐变背景开关
-+ 媒体库显示「我的订阅」
-+ 评论区链接解析
-+ 默认启动页设置
-
-### 修复
-+ 评论区内容重复
-+ pip相关问题
-+ 播放多p视频评论不刷新
-+ 视频评论翻页重复
-
-### 优化
-+ url scheme优化
-+ 图片预览放大
-+ 图片加载速度
-+ 视频评论区复制
-+ 全屏显示视频标题
-+ 网络异常处理
-
-  
-
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.21.0306.md

@@ -1,9 +0,0 @@
-## 1.0.21
-
-### 修复
-+ 推荐视频全屏问题
-+ 番剧全屏播放时灰屏问题
-+ 评论回调导致页面卡死问题
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.22.0430.md

@@ -1,27 +0,0 @@
-## 1.0.22
-
-### 功能
-+ 字幕
-+ 全屏时选集
-+ 动态转发
-+ 评论视频并转发
-+ 收藏夹删除
-+ 合集显示封面
-+ 底部导航栏编辑、排序功能
-+ 历史记录进度条展示
-+ 直播画质切换
-+ 排行榜功能
-+ 视频详情页推荐视频开关
-+ 显示联合投稿up
-  
-### 修复
-+ 收藏夹个数错误
-+ 封面保存权限问题
-+ 合集最后1p未展示
-+ up主页关注按钮触发灰屏
-
-### 优化
-+ 视频简介查看逻辑
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.23.0504.md

@@ -1,14 +0,0 @@
-## 1.0.23
-
-### 功能
-+ 封面下载
-
-  
-### 修复
-+ 全屏问题
-+ 视频播放器灰屏问题
-+ 评论区点击区域问题
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.24.0626.md

@@ -1,23 +0,0 @@
-## 1.0.24
-
-### 功能
-+ 私信功能
-+ 回复我的、收到的赞查看
-+ 新的登录方式
-+ 全屏选集
-+ 一键三连
-+ 按分区搜索
-
-### 优化
-+ 页面跳转动画
-+ 评论区跳转
-  
-### 修复
-+ 音画不同步问题
-+ 分集字幕未同步
-+ 多语言字幕
-+ 弹幕设置未生效
-+ 
-
-
-问题反馈、功能建议请查看「关于」页面。

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -9,7 +9,7 @@ PODS:
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
-    - FlutterMacOS
+    - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -23,7 +23,7 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - gt3_flutter_plugin (0.0.9):
+  - gt3_flutter_plugin (0.0.8):
     - Flutter
     - GT3Captcha-iOS
   - GT3Captcha-iOS (0.15.8.3)
@@ -38,8 +38,9 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.3.0):
+  - permission_handler_apple (9.1.1):
     - Flutter
+  - ReachabilitySwift (5.0.0)
   - saver_gallery (0.0.1):
     - Flutter
   - screen_brightness_ios (0.1.0):
@@ -70,7 +71,7 @@ DEPENDENCIES:
   - audio_service (from `.symlinks/plugins/audio_service/ios`)
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
+  - 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`)
@@ -99,6 +100,7 @@ SPEC REPOS:
   trunk:
     - FMDB
     - GT3Captcha-iOS
+    - ReachabilitySwift
     - Toast
 
 EXTERNAL SOURCES:
@@ -111,7 +113,7 @@ EXTERNAL SOURCES:
   auto_orientation:
     :path: ".symlinks/plugins/auto_orientation/ios"
   connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/darwin"
+    :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
@@ -164,21 +166,22 @@ SPEC CHECKSUMS:
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  gt3_flutter_plugin: 5bd2c08d3c19cbb6ee3b08f4358439e54c8ab2ee
+  gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23
   GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
@@ -186,11 +189,11 @@ SPEC CHECKSUMS:
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
   system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
   Toast: ec33c32b8688982cecc6348adeae667c1b9938da
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
+  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 

ios/Runner.xcodeproj/project.pbxproj

@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Info.plist

@@ -49,8 +49,6 @@
 		<true/>
 		<key>NSPhotoLibraryAddUsageDescription</key>
 		<string>请允许APP保存图片到相册</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>请允许APP保存图片到相册</string>
 		<key>NSCameraUsageDescription</key>
 		<string>App需要您的同意,才能访问相册</string>
 		<key>NSAppleMusicUsageDescription</key>

lib/common/pages_bottom_sheet.dart

@@ -1,172 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-import '../models/common/video_episode_type.dart';
-
-class EpisodeBottomSheet {
-  final List<dynamic> episodes;
-  final int currentCid;
-  final dynamic dataType;
-  final BuildContext context;
-  final Function changeFucCall;
-  final int? cid;
-  final double? sheetHeight;
-  bool isFullScreen = false;
-
-  EpisodeBottomSheet({
-    required this.episodes,
-    required this.currentCid,
-    required this.dataType,
-    required this.context,
-    required this.changeFucCall,
-    this.cid,
-    this.sheetHeight,
-    this.isFullScreen = false,
-  });
-
-  Widget buildEpisodeListItem(
-    dynamic episode,
-    int index,
-    bool isCurrentIndex,
-  ) {
-    Color primary = Theme.of(context).colorScheme.primary;
-    Color onSurface = Theme.of(context).colorScheme.onSurface;
-
-    String title = '';
-    switch (dataType) {
-      case VideoEpidoesType.videoEpisode:
-        title = episode.title;
-        break;
-      case VideoEpidoesType.videoPart:
-        title = episode.pagePart;
-        break;
-      case VideoEpidoesType.bangumiEpisode:
-        title = '第${episode.title}话  ${episode.longTitle!}';
-        break;
-    }
-    return isFullScreen || episode?.cover == null || episode?.cover == ''
-        ? ListTile(
-            onTap: () {
-              SmartDialog.showToast('切换至「$title」');
-              changeFucCall.call(episode, index);
-            },
-            dense: false,
-            leading: isCurrentIndex
-                ? Image.asset(
-                    'assets/images/live.gif',
-                    color: primary,
-                    height: 12,
-                  )
-                : null,
-            title: Text(title,
-                style: TextStyle(
-                  fontSize: 14,
-                  color: isCurrentIndex ? primary : onSurface,
-                )))
-        : InkWell(
-            onTap: () {
-              SmartDialog.showToast('切换至「$title」');
-              changeFucCall.call(episode, index);
-            },
-            child: Padding(
-              padding:
-                  const EdgeInsets.only(left: 14, right: 14, top: 8, bottom: 8),
-              child: Row(
-                children: [
-                  NetworkImgLayer(
-                      width: 130, height: 75, src: episode?.cover ?? ''),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Text(
-                      title,
-                      maxLines: 2,
-                      style: TextStyle(
-                        fontSize: 14,
-                        color: isCurrentIndex ? primary : onSurface,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-  }
-
-  Widget buildTitle() {
-    return AppBar(
-      toolbarHeight: 45,
-      automaticallyImplyLeading: false,
-      centerTitle: false,
-      title: Text(
-        '合集（${episodes.length}）',
-        style: Theme.of(context).textTheme.titleMedium,
-      ),
-      actions: !isFullScreen
-          ? [
-              IconButton(
-                icon: const Icon(Icons.close, size: 20),
-                onPressed: () => Navigator.pop(context),
-              ),
-              const SizedBox(width: 14),
-            ]
-          : null,
-    );
-  }
-
-  Widget buildShowContent(BuildContext context) {
-    final ItemScrollController itemScrollController = ItemScrollController();
-    int currentIndex = episodes.indexWhere((dynamic e) => e.cid == currentCid);
-    return StatefulBuilder(
-        builder: (BuildContext context, StateSetter setState) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        itemScrollController.jumpTo(index: currentIndex);
-      });
-      return Container(
-        height: sheetHeight,
-        color: Theme.of(context).colorScheme.surface,
-        child: Column(
-          children: [
-            buildTitle(),
-            Expanded(
-              child: Material(
-                child: PageStorage(
-                  bucket: PageStorageBucket(),
-                  child: ScrollablePositionedList.builder(
-                    itemScrollController: itemScrollController,
-                    itemCount: episodes.length + 1,
-                    itemBuilder: (BuildContext context, int index) {
-                      bool isLastItem = index == episodes.length;
-                      bool isCurrentIndex = currentIndex == index;
-                      return isLastItem
-                          ? SizedBox(
-                              height:
-                                  MediaQuery.of(context).padding.bottom + 20,
-                            )
-                          : buildEpisodeListItem(
-                              episodes[index],
-                              index,
-                              isCurrentIndex,
-                            );
-                    },
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      );
-    });
-  }
-
-  /// The [BuildContext] of the widget that calls the bottom sheet.
-  PersistentBottomSheetController show(BuildContext context) {
-    final PersistentBottomSheetController btmSheetCtr = showBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return buildShowContent(context);
-      },
-    );
-    return btmSheetCtr;
-  }
-}

lib/common/skeleton/skeleton.dart

@@ -13,8 +13,8 @@ class Skeleton extends StatelessWidget {
     var shimmerGradient = LinearGradient(
       colors: [
         Colors.transparent,
-        Theme.of(context).colorScheme.surface.withAlpha(10),
+        Theme.of(context).colorScheme.background.withAlpha(10),
-        Theme.of(context).colorScheme.surface.withAlpha(10),
+        Theme.of(context).colorScheme.background.withAlpha(10),
         Colors.transparent,
       ],
       stops: const [

lib/common/widgets/http_error.dart

@@ -2,18 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 class HttpError extends StatelessWidget {
-  const HttpError({
+  const HttpError(
-    required this.errMsg,
+      {required this.errMsg, required this.fn, this.btnText, super.key});
-    required this.fn,
-    this.btnText,
-    this.isShowBtn = true,
-    super.key,
-  });
 
   final String? errMsg;
   final Function()? fn;
   final String? btnText;
-  final bool isShowBtn;
 
   @override
   Widget build(BuildContext context) {
@@ -28,29 +22,20 @@ class HttpError extends StatelessWidget {
               "assets/images/error.svg",
               height: 200,
             ),
-            const SizedBox(height: 30),
+            const SizedBox(height: 20),
             Text(
               errMsg ?? '请求异常',
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.titleSmall,
             ),
-            const SizedBox(height: 20),
+            const SizedBox(height: 30),
-            if (isShowBtn)
+            OutlinedButton.icon(
-              FilledButton.tonal(
               onPressed: () {
                 fn!();
               },
-                style: ButtonStyle(
+              icon: const Icon(Icons.arrow_forward_outlined, size: 20),
-                  backgroundColor: MaterialStateProperty.resolveWith((states) {
+              label: Text(btnText ?? '点击重试'),
-                    return Theme.of(context).colorScheme.primary.withAlpha(20);
+            )
-                  }),
-                ),
-                child: Text(
-                  btnText ?? '点击重试',
-                  style:
-                      TextStyle(color: Theme.of(context).colorScheme.primary),
-                ),
-              ),
           ],
         ),
       ),

lib/common/widgets/network_img_layer.dart

@@ -2,7 +2,6 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/extension.dart';
-import 'package:pilipala/utils/global_data.dart';
 import '../../utils/storage.dart';
 import '../constants.dart';
 
@@ -33,12 +32,8 @@ class NetworkImgLayer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final int defaultImgQuality = GlobalData().imgQuality;
-    if (src == '' || src == null) {
-      return placeholder(context);
-    }
     final String imageUrl =
-        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
+        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
     int? memCacheWidth, memCacheHeight;
     double aspectRatio = (width / height).toDouble();
 
@@ -86,7 +81,7 @@ class NetworkImgLayer extends StatelessWidget {
                   fadeOutDuration ?? const Duration(milliseconds: 120),
               fadeInDuration:
                   fadeInDuration ?? const Duration(milliseconds: 120),
-              filterQuality: FilterQuality.low,
+              filterQuality: FilterQuality.high,
               errorWidget: (BuildContext context, String url, Object error) =>
                   placeholder(context),
               placeholder: (BuildContext context, String url) =>
@@ -109,9 +104,7 @@ class NetworkImgLayer extends StatelessWidget {
                 ? 0
                 : StyleString.imgRadius.x),
       ),
-      child: type == 'bg'
+      child: Center(
-          ? const SizedBox()
-          : Center(
         child: Image.asset(
           type == 'avatar'
               ? 'assets/images/noface.jpeg'

lib/common/widgets/overlay_pop.dart

@@ -0,0 +1,86 @@
+import 'package:flutter/material.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;
+
+  @override
+  Widget build(BuildContext context) {
+    final double imgWidth = MediaQuery.sizeOf(context).width - 8 * 2;
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 8),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.background,
+        borderRadius: BorderRadius.circular(10.0),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Stack(
+            children: [
+              NetworkImgLayer(
+                width: imgWidth,
+                height: imgWidth / StyleString.aspectRatio,
+                src: videoItem.pic! as String,
+                quality: 100,
+              ),
+              Positioned(
+                right: 8,
+                top: 8,
+                child: Container(
+                  width: 30,
+                  height: 30,
+                  decoration: BoxDecoration(
+                      color: Colors.black.withOpacity(0.3),
+                      borderRadius:
+                          const BorderRadius.all(Radius.circular(20))),
+                  child: IconButton(
+                    style: ButtonStyle(
+                      padding: MaterialStateProperty.all(EdgeInsets.zero),
+                    ),
+                    onPressed: () => closeFn!(),
+                    icon: const Icon(
+                      Icons.close,
+                      size: 18,
+                      color: Colors.white,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Padding(
+              padding: const EdgeInsets.fromLTRB(12, 10, 8, 10),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      videoItem.title! as String,
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  IconButton(
+                    tooltip: '保存封面图',
+                    onPressed: () async {
+                      await DownloadUtils.downloadImg(
+                        videoItem.pic != null
+                            ? videoItem.pic as String
+                            : videoItem.cover as String,
+                      );
+                      // closeFn!();
+                    },
+                    icon: const Icon(Icons.download, size: 20),
+                  )
+                ],
+              )),
+        ],
+      ),
+    );
+  }
+}

lib/common/widgets/stat/danmu.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatDanMu extends StatelessWidget {
   final String? theme;
-  final dynamic danmu;
+  final int? danmu;
   final String? size;
 
   const StatDanMu({Key? key, this.theme, this.danmu, this.size})
@@ -14,7 +14,7 @@ class StatDanMu extends StatelessWidget {
     Map<String, Color> colorObject = {
       'white': Colors.white,
       'gray': Theme.of(context).colorScheme.outline,
-      'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
+      'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
     return Row(

lib/common/widgets/stat/view.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatView extends StatelessWidget {
   final String? theme;
-  final dynamic view;
+  final int? view;
   final String? size;
 
   const StatView({Key? key, this.theme, this.view, this.size})
@@ -14,7 +14,7 @@ class StatView extends StatelessWidget {
     Map<String, Color> colorObject = {
       'white': Colors.white,
       'gray': Theme.of(context).colorScheme.outline,
-      'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
+      'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
     return Row(

lib/common/widgets/video_card_h.dart

@@ -1,11 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/http/constants.dart';
-import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/image_save.dart';
-import 'package:pilipala/utils/route_push.dart';
-import 'package:pilipala/utils/url_utils.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
 import '../../http/video.dart';
@@ -21,55 +16,43 @@ class VideoCardH extends StatelessWidget {
   const VideoCardH({
     super.key,
     required this.videoItem,
-    this.onPressedFn,
+    this.longPress,
+    this.longPressEnd,
     this.source = 'normal',
     this.showOwner = true,
     this.showView = true,
     this.showDanmaku = true,
     this.showPubdate = false,
-    this.showCharge = false,
   });
   // ignore: prefer_typing_uninitialized_variables
   final videoItem;
-  final Function()? onPressedFn;
+  final Function()? longPress;
-  // normal 推荐, later 稍后再看, search 搜索
+  final Function()? longPressEnd;
   final String source;
   final bool showOwner;
   final bool showView;
   final bool showDanmaku;
   final bool showPubdate;
-  final bool showCharge;
 
   @override
   Widget build(BuildContext context) {
     final int aid = videoItem.aid;
     final String bvid = videoItem.bvid;
-    String type = 'video';
-    try {
-      type = videoItem.type;
-    } catch (_) {}
     final String heroTag = Utils.makeHeroTag(aid);
-    return InkWell(
+    return GestureDetector(
+      onLongPress: () {
+        if (longPress != null) {
+          longPress!();
+        }
+      },
+      // onLongPressEnd: (details) {
+      //   if (longPressEnd != null) {
+      //     longPressEnd!();
+      //   }
+      // },
+      child: InkWell(
         onTap: () async {
           try {
-          if (type == 'ketang') {
-            SmartDialog.showToast('课堂视频暂不支持播放');
-            return;
-          }
-          if (showCharge && videoItem?.typeid == 33) {
-            final String redirectUrl = await UrlUtils.parseRedirectUrl(
-                '${HttpString.baseUrl}/video/$bvid/');
-            final String lastPathSegment = redirectUrl.split('/').last;
-            if (lastPathSegment.contains('ss')) {
-              RoutePush.bangumiPush(
-                  Utils.matchNum(lastPathSegment).first, null);
-            }
-            if (lastPathSegment.contains('ep')) {
-              RoutePush.bangumiPush(
-                  null, Utils.matchNum(lastPathSegment).first);
-            }
-            return;
-          }
             final int cid =
                 videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
             Get.toNamed('/video?bvid=$bvid&cid=$cid',
@@ -78,11 +61,6 @@ class VideoCardH extends StatelessWidget {
             SmartDialog.showToast(err.toString());
           }
         },
-      onLongPress: () => imageSaveDialog(
-        context,
-        videoItem,
-        SmartDialog.dismiss,
-      ),
         child: Padding(
           padding: const EdgeInsets.fromLTRB(
               StyleString.safeSpace, 5, StyleString.safeSpace, 5),
@@ -117,31 +95,16 @@ class VideoCardH extends StatelessWidget {
                                   height: maxHeight,
                                 ),
                               ),
-                            if (videoItem.duration != 0)
                               PBadge(
                                 text: Utils.timeFormat(videoItem.duration!),
                                 right: 6.0,
                                 bottom: 6.0,
                                 type: 'gray',
                               ),
-                            if (type != 'video')
-                              PBadge(
-                                text: type,
-                                left: 6.0,
-                                bottom: 6.0,
-                                type: 'primary',
-                              ),
                               // if (videoItem.rcmdReason != null &&
                               //     videoItem.rcmdReason.content != '')
                               //   pBadge(videoItem.rcmdReason.content, context,
                               //       6.0, 6.0, null, null),
-                            if (showCharge && videoItem?.isChargingSrc)
-                              const PBadge(
-                                text: '充电专属',
-                                right: 6.0,
-                                top: 6.0,
-                                type: 'primary',
-                              ),
                             ],
                           );
                         },
@@ -154,7 +117,6 @@ class VideoCardH extends StatelessWidget {
                       showView: showView,
                       showDanmaku: showDanmaku,
                       showPubdate: showPubdate,
-                    onPressedFn: onPressedFn,
                     )
                   ],
                 ),
@@ -162,6 +124,7 @@ class VideoCardH extends StatelessWidget {
             },
           ),
         ),
+      ),
     );
   }
 }
@@ -174,7 +137,6 @@ class VideoContent extends StatelessWidget {
   final bool showView;
   final bool showDanmaku;
   final bool showPubdate;
-  final Function()? onPressedFn;
 
   const VideoContent({
     super.key,
@@ -184,7 +146,6 @@ class VideoContent extends StatelessWidget {
     this.showView = true,
     this.showDanmaku = true,
     this.showPubdate = false,
-    this.onPressedFn,
   });
 
   @override
@@ -195,7 +156,7 @@ class VideoContent extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            if (source == 'normal' || source == 'later') ...[
+            if (videoItem.title is String) ...[
               Text(
                 videoItem.title as String,
                 textAlign: TextAlign.start,
@@ -210,7 +171,7 @@ class VideoContent extends StatelessWidget {
                 maxLines: 2,
                 text: TextSpan(
                   children: [
-                    for (final i in videoItem.titleList) ...[
+                    for (final i in videoItem.title) ...[
                       TextSpan(
                         text: i['text'] as String,
                         style: TextStyle(
@@ -277,86 +238,82 @@ class VideoContent extends StatelessWidget {
                     theme: 'gray',
                     danmu: videoItem.stat.danmaku as int,
                   ),
+
                 const Spacer(),
+                // SizedBox(
+                //   width: 20,
+                //   height: 20,
+                //   child: IconButton(
+                //     tooltip: '稍后再看',
+                //     style: ButtonStyle(
+                //       padding: MaterialStateProperty.all(EdgeInsets.zero),
+                //     ),
+                //     onPressed: () async {
+                //       var res =
+                //           await UserHttp.toViewLater(bvid: videoItem.bvid);
+                //       SmartDialog.showToast(res['msg']);
+                //     },
+                //     icon: Icon(
+                //       Icons.more_vert_outlined,
+                //       color: Theme.of(context).colorScheme.outline,
+                //       size: 14,
+                //     ),
+                //   ),
+                // ),
                 if (source == 'normal')
                   SizedBox(
                     width: 24,
                     height: 24,
-                    child: IconButton(
+                    child: PopupMenuButton<String>(
                       padding: EdgeInsets.zero,
-                      onPressed: () {
-                        feedBack();
-                        showModalBottomSheet(
-                          context: context,
-                          useRootNavigator: true,
-                          isScrollControlled: true,
-                          builder: (context) {
-                            return MorePanel(videoItem: videoItem);
-                          },
-                        );
-                      },
                       icon: Icon(
                         Icons.more_vert_outlined,
                         color: Theme.of(context).colorScheme.outline,
                         size: 14,
                       ),
-                    ),
+                      position: PopupMenuPosition.under,
-                  ),
+                      // constraints: const BoxConstraints(maxHeight: 35),
-                if (source == 'later') ...[
+                      onSelected: (String type) {},
-                  IconButton(
+                      itemBuilder: (BuildContext context) =>
-                    style: ButtonStyle(
+                          <PopupMenuEntry<String>>[
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        PopupMenuItem<String>(
-                    ),
+                          onTap: () async {
-                    onPressed: () => onPressedFn?.call(),
+                            var res = await UserHttp.toViewLater(
-                    icon: Icon(
+                                bvid: videoItem.bvid as String);
-                      Icons.clear_outlined,
-                      color: Theme.of(context).colorScheme.outline,
-                      size: 18,
-                    ),
-                  )
-                ],
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class MorePanel extends StatelessWidget {
-  final dynamic videoItem;
-  const MorePanel({super.key, required this.videoItem});
-
-  Future<dynamic> menuActionHandler(String type) async {
-    switch (type) {
-      case 'block':
-        blockUser();
-        break;
-      case 'watchLater':
-        var res = await UserHttp.toViewLater(bvid: videoItem.bvid as String);
                             SmartDialog.showToast(res['msg']);
-        Get.back();
+                          },
-        break;
+                          value: 'pause',
-      default:
+                          height: 40,
-    }
+                          child: const Row(
-  }
+                            children: [
-
+                              Icon(Icons.watch_later_outlined, size: 16),
-  void blockUser() async {
+                              SizedBox(width: 6),
+                              Text('稍后再看', style: TextStyle(fontSize: 13))
+                            ],
+                          ),
+                        ),
+                        const PopupMenuDivider(),
+                        PopupMenuItem<String>(
+                          onTap: () async {
                             SmartDialog.show(
                               useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
+                              animationType:
+                                  SmartAnimationType.centerFade_otherSlide,
                               builder: (BuildContext context) {
                                 return AlertDialog(
                                   title: const Text('提示'),
-          content: Text('确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+                                  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),
+                                        style: TextStyle(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .outline),
                                       ),
                                     ),
                                     TextButton(
@@ -367,7 +324,8 @@ class MorePanel extends StatelessWidget {
                                           reSrc: 11,
                                         );
                                         SmartDialog.dismiss();
-                SmartDialog.showToast(res['msg'] ?? '成功');
+                                        SmartDialog.showToast(
+                                            res['msg'] ?? '成功');
                                       },
                                       child: const Text('确认'),
                                     )
@@ -375,58 +333,26 @@ class MorePanel extends StatelessWidget {
                                 );
                               },
                             );
-  }
+                          },
-
+                          value: 'pause',
-  @override
+                          height: 40,
-  Widget build(BuildContext context) {
+                          child: Row(
-    return Container(
-      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
                             children: [
-          InkWell(
+                              const Icon(Icons.block, size: 16),
-            onTap: () => Get.back(),
+                              const SizedBox(width: 6),
-            child: Container(
+                              Text('拉黑：${videoItem.owner.name}',
-              height: 35,
+                                  style: const TextStyle(fontSize: 13))
-              padding: const EdgeInsets.only(bottom: 2),
-              child: Center(
-                child: Container(
-                  width: 32,
-                  height: 3,
-                  decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.outline,
-                      borderRadius: const BorderRadius.all(Radius.circular(3))),
-                ),
-              ),
-            ),
-          ),
-          ListTile(
-            onTap: () async => await menuActionHandler('block'),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.block, size: 19),
-            title: Text(
-              '拉黑up主 「${videoItem.owner.name}」',
-              style: Theme.of(context).textTheme.titleSmall,
-            ),
-          ),
-          ListTile(
-            onTap: () async => await menuActionHandler('watchLater'),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.watch_later_outlined, size: 19),
-            title:
-                Text('添加至稍后再看', style: Theme.of(context).textTheme.titleSmall),
-          ),
-          ListTile(
-            onTap: () =>
-                imageSaveDialog(context, videoItem, SmartDialog.dismiss),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.photo_outlined, size: 19),
-            title:
-                Text('查看视频封面', style: Theme.of(context).textTheme.titleSmall),
-          ),
-          const SizedBox(height: 20),
                             ],
                           ),
+                        ),
+                      ],
+                    ),
+                  ),
+              ],
+            ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/common/widgets/video_card_v.dart

@@ -1,15 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/image_save.dart';
-import 'package:pilipala/utils/route_push.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';
@@ -20,13 +16,15 @@ import 'network_img_layer.dart';
 class VideoCardV extends StatelessWidget {
   final dynamic videoItem;
   final int crossAxisCount;
-  final Function? blockUserCb;
+  final Function()? longPress;
+  final Function()? longPressEnd;
 
   const VideoCardV({
     Key? key,
     required this.videoItem,
     required this.crossAxisCount,
-    this.blockUserCb,
+    this.longPress,
+    this.longPressEnd,
   }) : super(key: key);
 
   bool isStringNumeric(String str) {
@@ -43,11 +41,23 @@ class VideoCardV extends StatelessWidget {
           return;
         }
         int epId = videoItem.param;
-        RoutePush.bangumiPush(
+        SmartDialog.showLoading(msg: '资源获取中');
-          null,
+        var result = await SearchHttp.bangumiInfo(seasonId: null, epId: epId);
-          epId,
+        if (result['status']) {
-          heroTag: heroTag,
+          var bangumiDetail = result['data'];
+          int cid = bangumiDetail.episodes!.first.cid;
+          String bvid = IdUtils.av2bv(bangumiDetail.episodes!.first.aid);
+          SmartDialog.dismiss().then(
+            (value) => Get.toNamed(
+              '/video?bvid=$bvid&cid=$cid&epId=$epId',
+              arguments: {
+                'pic': videoItem.pic,
+                'heroTag': heroTag,
+                'videoType': SearchType.media_bangumi,
+              },
+            ),
           );
+        }
         break;
       case 'av':
         String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid);
@@ -114,14 +124,23 @@ class VideoCardV extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(videoItem.id);
-    return InkWell(
+    return Card(
+      elevation: 0,
+      clipBehavior: Clip.hardEdge,
+      margin: EdgeInsets.zero,
+      child: GestureDetector(
+        onLongPress: () {
+          if (longPress != null) {
+            longPress!();
+          }
+        },
+        // onLongPressEnd: (details) {
+        //   if (longPressEnd != null) {
+        //     longPressEnd!();
+        //   }
+        // },
+        child: InkWell(
           onTap: () async => onPushDetail(heroTag),
-      onLongPress: () => imageSaveDialog(
-        context,
-        videoItem,
-        SmartDialog.dismiss,
-      ),
-      borderRadius: BorderRadius.circular(16),
           child: Column(
             children: [
               AspectRatio(
@@ -139,12 +158,12 @@ class VideoCardV extends StatelessWidget {
                           height: maxHeight,
                         ),
                       ),
-                  if (videoItem.duration > 0)
+                      if (videoItem.duration != null)
                         if (crossAxisCount == 1) ...[
                           PBadge(
                             bottom: 10,
                             right: 10,
-                        text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ] else ...[
                           PBadge(
@@ -152,20 +171,18 @@ class VideoCardV extends StatelessWidget {
                             right: 7,
                             size: 'small',
                             type: 'gray',
-                        text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ],
                     ],
                   );
                 }),
               ),
-          VideoContent(
+              VideoContent(videoItem: videoItem, crossAxisCount: crossAxisCount)
-            videoItem: videoItem,
-            crossAxisCount: crossAxisCount,
-            blockUserCb: blockUserCb,
-          )
             ],
           ),
+        ),
+      ),
     );
   }
 }
@@ -173,181 +190,220 @@ class VideoCardV extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final int crossAxisCount;
-  final Function? blockUserCb;
+  const VideoContent(
-
+      {Key? key, required this.videoItem, required this.crossAxisCount})
-  const VideoContent({
+      : super(key: key);
-    Key? key,
-    required this.videoItem,
-    required this.crossAxisCount,
-    this.blockUserCb,
-  }) : super(key: key);
-
-  Widget _buildBadge(String text, String type, [double fs = 12]) {
-    return PBadge(
-      text: text,
-      stack: 'normal',
-      size: 'small',
-      type: type,
-      fs: fs,
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return Expanded(
+      flex: crossAxisCount == 1 ? 0 : 1,
+      child: Padding(
         padding: crossAxisCount == 1
             ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
             : const EdgeInsets.fromLTRB(5, 8, 5, 4),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
+          // mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-          Text(
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
                     videoItem.title,
                     maxLines: 2,
                     overflow: TextOverflow.ellipsis,
                   ),
+                ),
+                if (videoItem.goto == 'av' && crossAxisCount == 1) ...[
+                  const SizedBox(width: 10),
+                  VideoPopupMenu(
+                    size: 32,
+                    iconSize: 18,
+                    videoItem: videoItem,
+                  ),
+                ],
+              ],
+            ),
             if (crossAxisCount > 1) ...[
               const SizedBox(height: 2),
-            VideoStat(videoItem: videoItem, crossAxisCount: crossAxisCount),
+              VideoStat(
+                videoItem: videoItem,
+              ),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
             Row(
               children: [
-              if (videoItem.goto == 'bangumi')
+                if (videoItem.goto == 'bangumi') ...[
-                _buildBadge(videoItem.bangumiBadge, 'line', 9),
+                  PBadge(
-              if (videoItem.rcmdReason?.content != null &&
+                    text: videoItem.bangumiBadge,
-                  videoItem.rcmdReason.content != '')
+                    stack: 'normal',
-                _buildBadge(videoItem.rcmdReason.content, 'color'),
+                    size: 'small',
-              if (videoItem.goto == 'picture') _buildBadge('动态', 'line', 9),
+                    type: 'line',
-              if (videoItem.isFollowed == 1) _buildBadge('已关注', 'color'),
+                    fs: 9,
+                  )
+                ],
+                if (videoItem.rcmdReason != null &&
+                    videoItem.rcmdReason.content != '') ...[
+                  PBadge(
+                    text: videoItem.rcmdReason.content,
+                    stack: 'normal',
+                    size: 'small',
+                    type: 'color',
+                  )
+                ],
+                if (videoItem.goto == 'picture') ...[
+                  const PBadge(
+                    text: '动态',
+                    stack: 'normal',
+                    size: 'small',
+                    type: 'line',
+                    fs: 9,
+                  )
+                ],
+                if (videoItem.isFollowed == 1) ...[
+                  const PBadge(
+                    text: '已关注',
+                    stack: 'normal',
+                    size: 'small',
+                    type: 'color',
+                  )
+                ],
                 Expanded(
                   flex: crossAxisCount == 1 ? 0 : 1,
                   child: Text(
                     videoItem.owner.name,
                     maxLines: 1,
                     style: TextStyle(
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
                       color: Theme.of(context).colorScheme.outline,
                     ),
                   ),
                 ),
                 if (crossAxisCount == 1) ...[
-                const SizedBox(width: 10),
+                  Text(
+                    ' • ',
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                  ),
                   VideoStat(
                     videoItem: videoItem,
-                  crossAxisCount: crossAxisCount,
                   ),
                   const Spacer(),
                 ],
-              if (videoItem.goto == 'av')
+                if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
-                SizedBox(
+                  VideoPopupMenu(
-                  width: 24,
+                    size: 24,
-                  height: 24,
+                    iconSize: 14,
-                  child: IconButton(
-                    padding: EdgeInsets.zero,
-                    onPressed: () {
-                      feedBack();
-                      showModalBottomSheet(
-                        context: context,
-                        useRootNavigator: true,
-                        isScrollControlled: true,
-                        builder: (context) {
-                          return MorePanel(
                     videoItem: videoItem,
-                            blockUserCb: blockUserCb,
-                          );
-                        },
-                      );
-                    },
-                    icon: Icon(
-                      Icons.more_vert_outlined,
-                      color: Theme.of(context).colorScheme.outline,
-                      size: 14,
                   ),
-                  ),
+                ] else ...[
-                )
+                  const SizedBox(height: 24)
+                ]
               ],
             ),
           ],
         ),
+      ),
     );
   }
 }
 
 class VideoStat extends StatelessWidget {
   final dynamic videoItem;
-  final int crossAxisCount;
 
   const VideoStat({
     Key? key,
     required this.videoItem,
-    required this.crossAxisCount,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return RichText(
-      children: [
-        StatView(theme: 'gray', view: videoItem.stat.view),
-        const SizedBox(width: 8),
-        StatDanMu(theme: 'gray', danmu: videoItem.stat.danmu),
-        if (videoItem is RecVideoItemModel) ...<Widget>[
-          crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
-          RichText(
       maxLines: 1,
       text: TextSpan(
         style: TextStyle(
-                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          fontSize: MediaQuery.textScalerOf(context)
+              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
           color: Theme.of(context).colorScheme.outline,
         ),
-                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
+        children: [
-          ),
+          if (videoItem.stat.view != '-')
-          const SizedBox(width: 4),
+            TextSpan(text: '${videoItem.stat.view}观看'),
-        ]
+          if (videoItem.stat.danmu != '-')
+            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
         ],
+      ),
     );
   }
 }
 
-class MorePanel extends StatelessWidget {
+class VideoPopupMenu extends StatelessWidget {
+  final double? size;
+  final double? iconSize;
   final dynamic videoItem;
-  final Function? blockUserCb;
+
-  const MorePanel({
+  const VideoPopupMenu({
-    super.key,
+    Key? key,
+    required this.size,
+    required this.iconSize,
     required this.videoItem,
-    this.blockUserCb,
+  }) : super(key: key);
-  });
 
-  Future<dynamic> menuActionHandler(String type) async {
+  @override
-    switch (type) {
+  Widget build(BuildContext context) {
-      case 'block':
+    return SizedBox(
-        Get.back();
+      width: size,
-        blockUser();
+      height: size,
-        break;
+      child: PopupMenuButton<String>(
-      case 'watchLater':
+        padding: EdgeInsets.zero,
-        var res = await UserHttp.toViewLater(bvid: videoItem.bvid as String);
+        icon: Icon(
+          Icons.more_vert_outlined,
+          color: Theme.of(context).colorScheme.outline,
+          size: iconSize,
+        ),
+        position: PopupMenuPosition.under,
+        // constraints: const BoxConstraints(maxHeight: 35),
+        onSelected: (String type) {},
+        itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+          PopupMenuItem<String>(
+            onTap: () async {
+              var res =
+                  await UserHttp.toViewLater(bvid: videoItem.bvid as String);
               SmartDialog.showToast(res['msg']);
-        Get.back();
+            },
-        break;
+            value: 'pause',
-      default:
+            height: 40,
-    }
+            child: const Row(
-  }
+              children: [
-
+                Icon(Icons.watch_later_outlined, size: 16),
-  void blockUser() async {
+                SizedBox(width: 6),
+                Text('稍后再看', style: TextStyle(fontSize: 13))
+              ],
+            ),
+          ),
+          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})?'
+                    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),
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.outline),
                         ),
                       ),
                       TextButton(
@@ -358,10 +414,7 @@ class MorePanel extends StatelessWidget {
                             reSrc: 11,
                           );
                           SmartDialog.dismiss();
-                if (res['status']) {
+                          SmartDialog.showToast(res['msg'] ?? '成功');
-                  blockUserCb?.call(videoItem.owner.mid);
-                }
-                SmartDialog.showToast(res['msg']);
                         },
                         child: const Text('确认'),
                       )
@@ -369,56 +422,18 @@ class MorePanel extends StatelessWidget {
                   );
                 },
               );
-  }
+            },
-
+            value: 'pause',
-  @override
+            height: 40,
-  Widget build(BuildContext context) {
+            child: Row(
-    return Container(
-      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
               children: [
-          InkWell(
+                const Icon(Icons.block, size: 16),
-            onTap: () => Get.back(),
+                const SizedBox(width: 6),
-            child: Container(
+                Text('拉黑：${videoItem.owner.name}',
-              height: 35,
+                    style: const TextStyle(fontSize: 13))
-              padding: const EdgeInsets.only(bottom: 2),
+              ],
-              child: Center(
-                child: Container(
-                  width: 32,
-                  height: 3,
-                  decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.outline,
-                      borderRadius: const BorderRadius.all(Radius.circular(3))),
             ),
           ),
-            ),
-          ),
-          ListTile(
-            onTap: () async => await menuActionHandler('block'),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.block, size: 19),
-            title: Text(
-              '拉黑up主 「${videoItem.owner.name}」',
-              style: Theme.of(context).textTheme.titleSmall,
-            ),
-          ),
-          ListTile(
-            onTap: () async => await menuActionHandler('watchLater'),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.watch_later_outlined, size: 19),
-            title:
-                Text('添加至稍后再看', style: Theme.of(context).textTheme.titleSmall),
-          ),
-          ListTile(
-            onTap: () =>
-                imageSaveDialog(context, videoItem, SmartDialog.dismiss),
-            minLeadingWidth: 0,
-            leading: const Icon(Icons.photo_outlined, size: 19),
-            title:
-                Text('查看视频封面', style: Theme.of(context).textTheme.titleSmall),
-          ),
-          const SizedBox(height: 20),
         ],
       ),
     );

lib/http/api.dart

@@ -189,7 +189,7 @@ class Api {
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索
-  static const String searchByType = '/x/web-interface/wbi/search/type';
+  static const String searchByType = '/x/web-interface/search/type';
 
   // 记录视频播放进度
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/report.md
@@ -214,9 +214,6 @@ 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
@@ -233,10 +230,6 @@ 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';
@@ -400,24 +393,12 @@ class Api {
       '${HttpString.passBaseUrl}/x/passport-login/captcha?source=main_web';
 
   // web端短信验证码
-  static const String webSmsCode =
+  static const String smsCode =
       '${HttpString.passBaseUrl}/x/passport-login/web/sms/send';
 
   // web端验证码登录
-  static const String webSmsLogin =
-      '${HttpString.passBaseUrl}/x/passport-login/web/login/sms';
 
   // web端密码登录
-  static const String loginInByWebPwd =
-      '${HttpString.passBaseUrl}/x/passport-login/web/login';
-
-  // web端二维码
-  static const String qrCodeApi =
-      '${HttpString.passBaseUrl}/x/passport-login/web/qrcode/generate';
-
-  // 扫码登录
-  static const String loginInByQrcode =
-      '${HttpString.passBaseUrl}/x/passport-login/web/qrcode/poll';
 
   // app端短信验证码
   static const String appSmsCode =
@@ -489,63 +470,4 @@ class Api {
 
   /// 获取未读动态数
   static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
-
-  /// 用户动态主页
-  static const dynamicSpmPrefix = 'https://space.bilibili.com/1/dynamic';
-
-  /// 激活buvid3
-  static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';
-
-  /// 获取字幕配置
-  static const getSubtitleConfig = '/x/player/v2';
-
-  /// 我的订阅
-  static const userSubFolder = '/x/v3/fav/folder/collected/list';
-
-  /// 我的订阅详情 type 21
-  static const userSeasonList = '/x/space/fav/season/list';
-
-  /// 我的订阅详情 type 11
-  static const userResourceList = '/x/v3/fav/resource/list';
-
-  /// 表情
-  static const emojiList = '/x/emote/user/panel/web';
-
-  /// 已读标记
-  static const String ackSessionMsg =
-      '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack';
-
-  /// 发送私信
-  static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
-
-  /// 排行榜
-  static const String getRankApi = "/x/web-interface/ranking/v2";
-
-  /// 取消订阅
-  static const String cancelSub = '/x/v3/fav/season/unfav';
-
-  /// 动态转发
-  static const String dynamicForwardUrl = '/x/dynamic/feed/create/submit_check';
-
-  /// 创建动态
-  static const String dynamicCreate = '/x/dynamic/feed/create/dyn';
-
-  /// 删除收藏夹
-  static const String delFavFolder = '/x/v3/fav/folder/del';
-
-  /// 搜索结果计数
-  static const String searchCount = '/x/web-interface/wbi/search/all/v2';
-
-  /// 关闭会话
-  static const String removeSession =
-      '${HttpString.tUrl}/session_svr/v1/session_svr/remove_session';
-
-  /// 消息未读数
-  static const String unread = '${HttpString.tUrl}/x/im/web/msgfeed/unread';
-
-  /// 回复我的
-  static const String messageReplyAPi = '/x/msgfeed/reply';
-
-  /// 收到的赞
-  static const String messageLikeAPi = '/x/msgfeed/like';
 }

lib/http/dynamics.dart

@@ -1,4 +1,3 @@
-import 'dart:math';
 import '../models/dynamics/result.dart';
 import '../models/dynamics/up.dart';
 import 'index.dart';
@@ -41,7 +40,6 @@ class DynamicsHttp {
         'status': false,
         'data': [],
         'msg': res.data['message'],
-        'code': res.data['code'],
       };
     }
   }
@@ -119,94 +117,4 @@ class DynamicsHttp {
       };
     }
   }
-
-  static Future dynamicForward() async {
-    var res = await Request().post(
-      Api.dynamicForwardUrl,
-      queryParameters: {
-        'csrf': await Request.getCsrf(),
-        'x-bili-device-req-json': {'platform': 'web', 'device': 'pc'},
-        'x-bili-web-req-json': {'spm_id': '333.999'},
-      },
-      data: {
-        'attach_card': null,
-        'scene': 4,
-        'content': {
-          'conetents': [
-            {'raw_text': "2", 'type': 1, 'biz_id': ""}
-          ]
-        }
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
-
-  static Future dynamicCreate({
-    required int mid,
-    required int scene,
-    int? oid,
-    String? dynIdStr,
-    String? rawText,
-  }) async {
-    DateTime now = DateTime.now();
-    int timestamp = now.millisecondsSinceEpoch ~/ 1000;
-    Random random = Random();
-    int randomNumber = random.nextInt(9000) + 1000;
-    String uploadId = '${mid}_${timestamp}_$randomNumber';
-
-    Map<String, dynamic> webRepostSrc = {
-      'dyn_id_str': dynIdStr ?? '',
-    };
-
-    /// 投稿转发
-    if (scene == 5) {
-      webRepostSrc = {
-        'revs_id': {'dyn_type': 8, 'rid': oid}
-      };
-    }
-    var res = await Request().post(Api.dynamicCreate, queryParameters: {
-      'platform': 'web',
-      'csrf': await Request.getCsrf(),
-      'x-bili-device-req-json': {'platform': 'web', 'device': 'pc'},
-      'x-bili-web-req-json': {'spm_id': '333.999'},
-    }, data: {
-      'dyn_req': {
-        'content': {
-          'contents': [
-            {'raw_text': rawText ?? '', 'type': 1, 'biz_id': ''}
-          ]
-        },
-        'scene': scene,
-        'attach_card': null,
-        'upload_id': uploadId,
-        'meta': {
-          'app_meta': {'from': 'create.dynamic.web', 'mobi_app': 'web'}
-        }
-      },
-      'web_repost_src': webRepostSrc
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/init.dart

@@ -1,9 +1,7 @@
 // ignore_for_file: avoid_print
 import 'dart:async';
-import 'dart:convert';
 import 'dart:developer';
 import 'dart:io';
-import 'dart:math' show Random;
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
@@ -13,7 +11,6 @@ import 'package:hive/hive.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
-import 'api.dart';
 import 'constants.dart';
 import 'interceptor.dart';
 
@@ -27,7 +24,6 @@ class Request {
   late bool enableSystemProxy;
   late String systemProxyHost;
   late String systemProxyPort;
-  static final RegExp spmPrefixExp = RegExp(r'<meta name="spm_prefix" content="([^"]+?)">');
 
   /// 设置cookie
   static setCookie() async {
@@ -55,12 +51,13 @@ class Request {
     }
     setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
 
+    if (cookie.isEmpty) {
       try {
-      await buvidActivate();
+        await Request().get(HttpString.baseUrl);
       } catch (e) {
         log("setCookie, ${e.toString()}");
       }
-
+    }
     final String cookieString = cookie
         .map((Cookie cookie) => '${cookie.name}=${cookie.value}')
         .join('; ');
@@ -90,33 +87,6 @@ class Request {
     dio.options.headers['referer'] = 'https://www.bilibili.com/';
   }
 
-  static Future buvidActivate() async {
-    var html = await Request().get(Api.dynamicSpmPrefix);
-    String spmPrefix = spmPrefixExp.firstMatch(html.data)!.group(1)!;
-    Random rand = Random();
-    String rand_png_end = base64.encode(
-      List<int>.generate(32, (_) => rand.nextInt(256)) +
-      List<int>.filled(4, 0) +
-      [73, 69, 78, 68] +
-      List<int>.generate(4, (_) => rand.nextInt(256))
-    );
-
-    String jsonData = json.encode({
-      '3064': 1,
-      '39c8': '${spmPrefix}.fp.risk',
-      '3c43': {
-        'adca': 'Linux',
-        'bfe9': rand_png_end.substring(rand_png_end.length - 50),
-      },
-    });
-
-    await Request().post(
-      Api.activateBuvidApi,
-      data: {'payload': jsonData},
-      options: Options(contentType: 'application/json')
-    );
-  }
-
   /*
    * config it and create
    */

lib/http/interceptor.dart

@@ -45,13 +45,10 @@ class ApiInterceptor extends Interceptor {
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     // 处理网络请求错误
     // handler.next(err);
-    String url = err.requestOptions.uri.toString();
-    if (!url.contains('heartbeat')) {
     SmartDialog.showToast(
       await dioError(err),
       displayType: SmartToastType.onlyRefresh,
     );
-    }
     super.onError(err, handler);
   }
 
@@ -78,23 +75,22 @@ class ApiInterceptor extends Interceptor {
   }
 
   static Future<String> checkConnect() async {
-    final List<ConnectivityResult> connectivityResult =
+    final ConnectivityResult connectivityResult =
         await Connectivity().checkConnectivity();
-    if (connectivityResult.contains(ConnectivityResult.mobile)) {
+    switch (connectivityResult) {
+      case ConnectivityResult.mobile:
         return '正在使用移动流量';
-    } else if (connectivityResult.contains(ConnectivityResult.wifi)) {
+      case ConnectivityResult.wifi:
         return '正在使用wifi';
-    } else if (connectivityResult.contains(ConnectivityResult.ethernet)) {
+      case ConnectivityResult.ethernet:
         return '正在使用局域网';
-    } else if (connectivityResult.contains(ConnectivityResult.vpn)) {
+      case ConnectivityResult.vpn:
         return '正在使用代理网络';
-    } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) {
+      case ConnectivityResult.other:
-      return '正在使用蓝牙网络';
-    } else if (connectivityResult.contains(ConnectivityResult.other)) {
         return '正在使用其他网络';
-    } else if (connectivityResult.contains(ConnectivityResult.none)) {
+      case ConnectivityResult.none:
         return '未连接到任何网络';
-    } else {
+      default:
         return '';
     }
   }

lib/http/live.dart

@@ -1,6 +1,5 @@
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
-import '../models/live/room_info_h5.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -47,22 +46,4 @@ 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'],
-      };
-    }
-  }
 }

lib/http/login.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
 import 'package:encrypt/encrypt.dart';
-import 'package:pilipala/http/constants.dart';
 import 'package:uuid/uuid.dart';
 import '../models/login/index.dart';
 import '../utils/login.dart';
@@ -22,32 +21,32 @@ class LoginHttp {
     }
   }
 
-  // static Future sendSmsCode({
+  static Future sendSmsCode({
-  //   int? cid,
+    int? cid,
-  //   required int tel,
+    required int tel,
-  //   required String token,
+    required String token,
-  //   required String challenge,
+    required String challenge,
-  //   required String validate,
+    required String validate,
-  //   required String seccode,
+    required String seccode,
-  // }) async {
+  }) async {
-  //   var res = await Request().post(
+    var res = await Request().post(
-  //     Api.appSmsCode,
+      Api.appSmsCode,
-  //     data: {
+      data: {
-  //       'cid': cid,
+        'cid': cid,
-  //       'tel': tel,
+        'tel': tel,
-  //       "source": "main_web",
+        "source": "main_web",
-  //       'token': token,
+        'token': token,
-  //       'challenge': challenge,
+        'challenge': challenge,
-  //       'validate': validate,
+        'validate': validate,
-  //       'seccode': seccode,
+        'seccode': seccode,
-  //     },
+      },
-  //     options: Options(
+      options: Options(
-  //       contentType: Headers.formUrlEncodedContentType,
+        contentType: Headers.formUrlEncodedContentType,
-  //       // headers: {'user-agent': ApiConstants.userAgent}
+        // headers: {'user-agent': ApiConstants.userAgent}
-  //     ),
+      ),
-  //   );
+    );
-  //   print(res);
+    print(res);
-  // }
+  }
 
   // web端验证码
   static Future sendWebSmsCode({
@@ -61,7 +60,6 @@ class LoginHttp {
     Map data = {
       'cid': cid,
       'tel': tel,
-      "source": "main_web",
       'token': token,
       'challenge': challenge,
       'validate': validate,
@@ -69,56 +67,17 @@ class LoginHttp {
     };
     FormData formData = FormData.fromMap({...data});
     var res = await Request().post(
-      Api.webSmsCode,
+      Api.smsCode,
       data: formData,
       options: Options(
         contentType: Headers.formUrlEncodedContentType,
       ),
     );
-    if (res.data['code'] == 0) {
+    print(res);
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
-    }
   }
 
   // web端验证码登录
-  static Future loginInByWebSmsCode({
+  static Future loginInByWebSmsCode() async {}
-    int? cid,
-    required int tel,
-    required int code,
-    required String captchaKey,
-  }) async {
-    // webSmsLogin
-    Map data = {
-      "cid": cid,
-      "tel": tel,
-      "code": code,
-      "source": "main_mini",
-      "keep": 0,
-      "captcha_key": captchaKey,
-      "go_url": HttpString.baseUrl
-    };
-    FormData formData = FormData.fromMap({...data});
-    var res = await Request().post(
-      Api.webSmsLogin,
-      data: formData,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
-    );
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
-    }
-  }
 
   // web端密码登录
   static Future liginInByWebPwd() async {}
@@ -214,69 +173,4 @@ class LoginHttp {
     );
     print(res);
   }
-
-  // web端密码登录
-  static Future loginInByWebPwd({
-    required int username,
-    required String password,
-    required String token,
-    required String challenge,
-    required String validate,
-    required String seccode,
-  }) async {
-    Map data = {
-      'username': username,
-      'password': password,
-      'keep': 0,
-      'token': token,
-      'challenge': challenge,
-      'validate': validate,
-      'seccode': seccode,
-      'source': 'main-fe-header',
-      "go_url": HttpString.baseUrl
-    };
-    FormData formData = FormData.fromMap({...data});
-    var res = await Request().post(
-      Api.loginInByWebPwd,
-      data: formData,
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
-    );
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
-    }
-  }
-
-  // web端登录二维码
-  static Future getWebQrcode() async {
-    var res = await Request().get(Api.qrCodeApi);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
-    }
-  }
-
-  // web端二维码轮询登录状态
-  static Future queryWebQrcodeStatus(String qrcodeKey) async {
-    var res = await Request()
-        .get(Api.loginInByQrcode, data: {'qrcode_key': qrcodeKey});
-    if (res.data['data']['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
-    }
-  }
 }

lib/http/member.dart

@@ -79,8 +79,6 @@ class MemberHttp {
     String order = 'pubdate',
     bool orderAvoided = true,
   }) async {
-    String dmImgStr = Utils.base64EncodeRandomString(16, 64);
-    String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128);
     Map params = await WbiSign().makSign({
       'mid': mid,
       'ps': ps,
@@ -90,11 +88,7 @@ class MemberHttp {
       'order': order,
       'platform': 'web',
       'web_location': 1550101,
-      'order_avoided': orderAvoided,
+      'order_avoided': orderAvoided
-      'dm_img_list': '[]',
-      'dm_img_str': dmImgStr.substring(0, dmImgStr.length - 2),
-      'dm_cover_img_str': dmCoverImgStr.substring(0, dmCoverImgStr.length - 2),
-      'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}',
     });
     var res = await Request().get(
       Api.memberArchive,
@@ -107,13 +101,10 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -132,13 +123,10 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -473,41 +461,4 @@ 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'],
-      };
-    }
-  }
 }

lib/http/msg.dart

@@ -1,8 +1,3 @@
-import 'dart:convert';
-import 'dart:math';
-import 'package:dio/dio.dart';
-import 'package:pilipala/models/msg/like.dart';
-import 'package:pilipala/models/msg/reply.dart';
 import '../models/msg/account.dart';
 import '../models/msg/session.dart';
 import '../utils/wbi_sign.dart';
@@ -27,22 +22,14 @@ class MsgHttp {
     Map signParams = await WbiSign().makSign(params);
     var res = await Request().get(Api.sessionList, data: signParams);
     if (res.data['code'] == 0) {
-      try {
       return {
         'status': true,
         'data': SessionDataModel.fromJson(res.data['data']),
       };
-      } catch (err) {
-        return {
-          'status': false,
-          'data': [],
-          'msg': err.toString(),
-        };
-      }
     } else {
       return {
         'status': false,
-        'data': [],
+        'date': [],
         'msg': res.data['message'],
       };
     }
@@ -55,16 +42,12 @@ class MsgHttp {
       'mobi_app': 'web',
     });
     if (res.data['code'] == 0) {
-      try {
       return {
         'status': true,
         'data': res.data['data']
             .map<AccountListModel>((e) => AccountListModel.fromJson(e))
             .toList(),
       };
-      } catch (err) {
-        print('err🔟: $err');
-      }
     } else {
       return {
         'status': false,
@@ -103,188 +86,4 @@ class MsgHttp {
       };
     }
   }
-
-  // 消息标记已读
-  static Future ackSessionMsg({
-    int? talkerId,
-    int? ackSeqno,
-  }) async {
-    String csrf = await Request.getCsrf();
-    Map params = await WbiSign().makSign({
-      'talker_id': talkerId,
-      'session_type': 1,
-      'ack_seqno': ackSeqno,
-      'build': 0,
-      'mobi_app': 'web',
-      'csrf_token': csrf,
-      'csrf': csrf
-    });
-    var res = await Request().get(Api.ackSessionMsg, data: params);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
-
-  // 发送私信
-  static Future sendMsg({
-    required int senderUid,
-    required int receiverId,
-    int? receiverType,
-    int? msgType,
-    dynamic content,
-  }) async {
-    String csrf = await Request.getCsrf();
-    var res = await Request().post(
-      Api.sendMsg,
-      data: {
-        'msg[sender_uid]': senderUid,
-        'msg[receiver_id]': receiverId,
-        'msg[receiver_type]': 1,
-        'msg[msg_type]': 1,
-        'msg[msg_status]': 0,
-        'msg[content]': jsonEncode(content),
-        'msg[timestamp]': DateTime.now().millisecondsSinceEpoch ~/ 1000,
-        'msg[new_face_version]': 0,
-        'msg[dev_id]': getDevId(),
-        'from_firework': 0,
-        'build': 0,
-        'mobi_app': 'web',
-        'csrf_token': csrf,
-        'csrf': csrf,
-      },
-      options: Options(
-        contentType: Headers.formUrlEncodedContentType,
-      ),
-    );
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
-
-  static String getDevId() {
-    final List<String> b = [
-      '0',
-      '1',
-      '2',
-      '3',
-      '4',
-      '5',
-      '6',
-      '7',
-      '8',
-      '9',
-      'A',
-      'B',
-      'C',
-      'D',
-      'E',
-      'F'
-    ];
-    final List<String> s = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split('');
-    for (int i = 0; i < s.length; i++) {
-      if ('-' == s[i] || '4' == s[i]) {
-        continue;
-      }
-      final int randomInt = Random().nextInt(16);
-      if ('x' == s[i]) {
-        s[i] = b[randomInt];
-      } else {
-        s[i] = b[3 & randomInt | 8];
-      }
-    }
-    return s.join();
-  }
-
-  static Future removeSession({
-    int? talkerId,
-  }) async {
-    String csrf = await Request.getCsrf();
-    Map params = await WbiSign().makSign({
-      'talker_id': talkerId,
-      'session_type': 1,
-      'build': 0,
-      'mobi_app': 'web',
-      'csrf_token': csrf,
-      'csrf': csrf
-    });
-    var res = await Request().get(Api.removeSession, data: params);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
-
-  static Future unread() async {
-    var res = await Request().get(Api.unread);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
-
-  // 回复我的
-  static Future messageReply({
-    int? id,
-    int? replyTime,
-  }) async {
-    var params = {
-      if (id != null) 'id': id,
-      if (replyTime != null) 'reply_time': replyTime,
-    };
-    var res = await Request().get(Api.messageReplyAPi, data: params);
-    if (res.data['code'] == 0) {
-      try {
-        return {
-          'status': true,
-          'data': MessageReplyModel.fromJson(res.data['data']),
-        };
-      } catch (err) {
-        return {'status': false, 'date': [], 'msg': err.toString()};
-      }
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
-
-  // 收到的赞
-  static Future messageLike({
-    int? id,
-    int? likeTime,
-  }) async {
-    var params = {
-      if (id != null) 'id': id,
-      if (likeTime != null) 'like_time': likeTime,
-    };
-    var res = await Request().get(Api.messageLikeAPi, data: params);
-    if (res.data['code'] == 0) {
-      try {
-        return {
-          'status': true,
-          'data': MessageLikeModel.fromJson(res.data['data']),
-        };
-      } catch (err) {
-        return {'status': false, 'date': [], 'msg': err.toString()};
-      }
-    } else {
-      return {'status': false, 'date': [], 'msg': res.data['message']};
-    }
-  }
 }

lib/http/reply.dart

@@ -1,5 +1,4 @@
 import '../models/video/reply/data.dart';
-import '../models/video/reply/emote.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -22,14 +21,19 @@ class ReplyHttp {
       return {
         'status': true,
         'data': ReplyData.fromJson(res.data['data']),
-        'code': 200,
       };
     } else {
+      Map errMap = {
+        -400: '请求错误',
+        -404: '无此项',
+        12002: '当前页面评论功能已关闭',
+        12009: '评论主体的type不合法',
+        12061: 'UP主已关闭评论区',
+      };
       return {
         'status': false,
         'date': [],
-        'code': res.data['code'],
+        'msg': errMap[res.data['code']] ?? res.data['message'],
-        'msg': res.data['message'],
       };
     }
   }
@@ -96,23 +100,4 @@ class ReplyHttp {
       };
     }
   }
-
-  static Future getEmoteList({String? business}) async {
-    var res = await Request().get(Api.emojiList, data: {
-      'business': business ?? 'reply',
-      'web_location': '333.1245',
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': EmoteModelData.fromJson(res.data['data']),
-      };
-    } else {
-      return {
-        'status': false,
-        'date': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/search.dart

@@ -1,7 +1,5 @@
 import 'dart:convert';
 import 'package:hive/hive.dart';
-import 'package:pilipala/models/search/all.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
 import '../models/bangumi/info.dart';
 import '../models/common/search_type.dart';
 import '../models/search/hot.dart';
@@ -75,7 +73,6 @@ class SearchHttp {
     required page,
     String? order,
     int? duration,
-    int? tids,
   }) async {
     var reqData = {
       'search_type': searchType.type,
@@ -85,14 +82,9 @@ class SearchHttp {
       'page': page,
       if (order != null) 'order': order,
       if (duration != null) 'duration': duration,
-      if (tids != null && tids != -1) 'tids': tids,
     };
     var res = await Request().get(Api.searchByType, data: reqData);
-    if (res.data['code'] == 0) {
+    if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
-      if (res.data['data']['numPages'] == 0) {
-        // 我想返回数据，使得可以通过data.list 取值，结果为[]
-        return {'status': true, 'data': Data()};
-      }
       Object data;
       try {
         switch (searchType) {
@@ -129,7 +121,9 @@ class SearchHttp {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': res.data['data'] != null && res.data['data']['numPages'] == 0
+            ? '没有相关数据'
+            : res.data['message'],
       };
     }
   }
@@ -169,48 +163,4 @@ class SearchHttp {
       };
     }
   }
-
-  static Future<Map<String, dynamic>> ab2cWithPic(
-      {int? aid, String? bvid}) async {
-    Map<String, dynamic> data = {};
-    if (aid != null) {
-      data['aid'] = aid;
-    } else if (bvid != null) {
-      data['bvid'] = bvid;
-    }
-    final dynamic res =
-        await Request().get(Api.ab2c, data: <String, dynamic>{...data});
-    return {
-      'cid': res.data['data'].first['cid'],
-      'pic': res.data['data'].first['first_frame'],
-    };
-  }
-
-  static Future<Map<String, dynamic>> searchCount(
-      {required String keyword}) async {
-    Map<String, dynamic> data = {
-      'keyword': keyword,
-      'web_location': 333.999,
-    };
-    Map params = await WbiSign().makSign(data);
-    final dynamic res = await Request().get(Api.searchCount, data: params);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SearchAllModel.fromJson(res.data['data']),
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': '请求错误 🙅',
-      };
-    }
-  }
-}
-
-class Data {
-  List<dynamic> list;
-
-  Data({this.list = const []});
 }

lib/http/user.dart

@@ -6,8 +6,6 @@ import '../models/user/fav_folder.dart';
 import '../models/user/history.dart';
 import '../models/user/info.dart';
 import '../models/user/stat.dart';
-import '../models/user/sub_detail.dart';
-import '../models/user/sub_folder.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -62,8 +60,7 @@ class UserHttp {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'],
+        'msg': res.data['message'] ?? '账号未登录'
-        'code': res.data['code'],
       };
     }
   }
@@ -112,12 +109,7 @@ class UserHttp {
         'data': {'list': list, 'count': res.data['data']['count']}
       };
     } else {
-      return {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-        'code': res.data['code'],
-      };
     }
   }
 
@@ -132,12 +124,7 @@ class UserHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': HistoryData.fromJson(res.data['data'])};
     } else {
-      return {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-        'code': res.data['code'],
-      };
     }
   }
 
@@ -318,114 +305,4 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
-
-  // 我的订阅
-  static Future userSubFolder({
-    required int mid,
-    required int pn,
-    required int ps,
-  }) async {
-    var res = await Request().get(Api.userSubFolder, data: {
-      'up_mid': mid,
-      'ps': ps,
-      'pn': pn,
-      'platform': 'web',
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SubFolderModelData.fromJson(res.data['data'])
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-        'code': res.data['code'],
-      };
-    }
-  }
-
-  static Future userSeasonList({
-    required int seasonId,
-    required int pn,
-    required int ps,
-  }) async {
-    var res = await Request().get(Api.userSeasonList, data: {
-      'season_id': seasonId,
-      'ps': ps,
-      'pn': pn,
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SubDetailModelData.fromJson(res.data['data'])
-      };
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
-
-  static Future userResourceList({
-    required int seasonId,
-    required int pn,
-    required int ps,
-  }) async {
-    var res = await Request().get(Api.userResourceList, data: {
-      'media_id': seasonId,
-      'ps': ps,
-      'pn': pn,
-      'keyword': '',
-      'order': 'mtime',
-      'type': 0,
-      'tid': 0,
-      'platform': 'web',
-    });
-    if (res.data['code'] == 0) {
-      try {
-        return {
-          'status': true,
-          'data': SubDetailModelData.fromJson(res.data['data'])
-        };
-      } catch (err) {
-        return {'status': false, 'msg': err};
-      }
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
-
-  // 取消订阅
-  static Future cancelSub({required int seasonId}) async {
-    var res = await Request().post(
-      Api.cancelSub,
-      queryParameters: {
-        'platform': 'web',
-        'season_id': seasonId,
-        'csrf': await Request.getCsrf(),
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {'status': true};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
-
-  // 删除文件夹
-  static Future delFavFolder({required int mediaIds}) async {
-    var res = await Request().post(
-      Api.delFavFolder,
-      queryParameters: {
-        'media_ids': mediaIds,
-        'platform': 'web',
-        'csrf': await Request.getCsrf(),
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {'status': true};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
 }

lib/http/video.dart

@@ -8,11 +8,8 @@ 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/subTitile/result.dart';
 import '../models/video_detail_res.dart';
-import '../utils/recommend_filter.dart';
 import '../utils/storage.dart';
-import '../utils/subtitle.dart';
 import '../utils/wbi_sign.dart';
 import 'api.dart';
 import 'init.dart';
@@ -35,7 +32,7 @@ class VideoHttp {
         Api.recommendListWeb,
         data: {
           'version': 1,
-          'feed_version': 'V3',
+          'feed_version': 'V8',
           'homepage_ver': 1,
           'ps': ps,
           'fresh_idx': freshIdx,
@@ -49,13 +46,8 @@ class VideoHttp {
             setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
         for (var i in res.data['data']['item']) {
           //过滤掉live与ad，以及拉黑用户
-          if (i['goto'] == 'av' &&
+          if (i['goto'] == 'av' && !blackMidsList.contains(i['owner']['mid'])) {
-              (i['owner'] != null &&
+            list.add(RecVideoItemModel.fromJson(i));
-                  !blackMidsList.contains(i['owner']['mid']))) {
-            RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i);
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
           }
         }
         return {'status': true, 'data': list};
@@ -67,9 +59,7 @@ class VideoHttp {
     }
   }
 
-  // 添加额外的loginState变量模拟未登录状态
+  static Future rcmdVideoListApp({int? ps, required int freshIdx}) async {
-  static Future rcmdVideoListApp(
-      {bool loginStatus = true, required int freshIdx}) async {
     try {
       var res = await Request().get(
         Api.recommendListApp,
@@ -82,11 +72,9 @@ class VideoHttp {
           'device_name': 'vivo',
           'pull': freshIdx == 0 ? 'true' : 'false',
           'appkey': Constants.appKey,
-          'access_key': loginStatus
+          'access_key': localCache
-              ? (localCache.get(LocalCacheKey.accessKey,
+                  .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
-                      defaultValue: {})['value'] ??
+              ''
-                  '')
-              : ''
         },
       );
       if (res.data['code'] == 0) {
@@ -99,15 +87,12 @@ class VideoHttp {
               (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
               (i['args'] != null &&
                   !blackMidsList.contains(i['args']['up_mid']))) {
-            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
+            list.add(RecVideoItemAppModel.fromJson(i));
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
           }
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': [], 'msg': ''};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err.toString()};
@@ -132,7 +117,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': []};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};
@@ -192,15 +177,22 @@ class VideoHttp {
   // 视频信息 标题、简介
   static Future videoIntro({required String bvid}) async {
     var res = await Request().get(Api.videoIntro, data: {'bvid': bvid});
-    if (res.data['code'] == 0) {
     VideoDetailResponse result = VideoDetailResponse.fromJson(res.data);
+    if (result.code == 0) {
       return {'status': true, 'data': result.data!};
     } else {
+      Map errMap = {
+        -400: '请求错误',
+        -403: '权限不足',
+        -404: '视频资源失效',
+        62002: '稿件不可见',
+        62004: '稿件审核中',
+      };
       return {
         'status': false,
         'data': null,
-        'code': res.data['code'],
+        'code': result.code,
-        'msg': res.data['message'],
+        'msg': errMap[result.code] ?? '请求异常',
       };
     }
   }
@@ -211,10 +203,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
       for (var i in res.data['data']) {
-        HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i);
+        list.add(HotVideoItemModel.fromJson(i));
-        if (!RecommendFilter.filter(videoItem, relatedVideos: true)) {
-          list.add(videoItem);
-        }
       }
       return {'status': true, 'data': list};
     } else {
@@ -317,7 +306,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -387,15 +376,9 @@ class VideoHttp {
       'csrf': await Request.getCsrf(),
     });
     if (res.data['code'] == 0) {
-      if (act == 5) {
+      return {'status': true, 'data': res.data['data']};
-        List<int> blackMidsList =
-            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
-        blackMidsList.add(mid);
-        setting.put(SettingBoxKey.blackMidsList, blackMidsList);
-      }
-      return {'status': true, 'data': res.data['data'], 'msg': '成功'};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {'status': false, 'data': []};
     }
   }
 
@@ -476,54 +459,4 @@ class VideoHttp {
       return {'status': false, 'data': []};
     }
   }
-
-  static Future getSubtitle({int? cid, String? bvid}) async {
-    var res = await Request().get(Api.getSubtitleConfig, data: {
-      'cid': cid,
-      'bvid': bvid,
-    });
-    try {
-      if (res.data['code'] == 0) {
-        return {
-          'status': true,
-          'data': SubTitlteModel.fromJson(res.data['data']),
-        };
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['msg']};
-      }
-    } catch (err) {
-      print(err);
-    }
-  }
-
-  // 视频排行
-  static Future getRankVideoList(int rid) async {
-    try {
-      var rankApi = "${Api.getRankApi}?rid=$rid&type=all";
-      var res = await Request().get(rankApi);
-      if (res.data['code'] == 0) {
-        List<HotVideoItemModel> list = [];
-        List<int> blackMidsList =
-            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
-        for (var i in res.data['data']['list']) {
-          if (!blackMidsList.contains(i['owner']['mid'])) {
-            list.add(HotVideoItemModel.fromJson(i));
-          }
-        }
-        return {'status': true, 'data': list};
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
-      }
-    } catch (err) {
-      return {'status': false, 'data': [], 'msg': err};
-    }
-  }
-
-  // 获取字幕内容
-  static Future<Map<String, dynamic>> getSubtitleContent(url) async {
-    var res = await Request().get('https:$url');
-    final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
-    final List body = res.data['body'];
-    return {'content': content, 'body': body};
-  }
 }

lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -20,31 +19,41 @@ import 'package:pilipala/pages/main/view.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
-import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:media_kit/media_kit.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();
   MediaKit.ensureInitialized();
-  await SystemChrome.setPreferredOrientations(
+  SystemChrome.setPreferredOrientations(
-      [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+          [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
+      .then((_) async {
     await GStrorage.init();
     await setupServiceLocator();
-  clearLogs();
     Request();
     await Request.setCookie();
 
     // 异常捕获 logo记录
+    final Catcher2Options debugConfig = Catcher2Options(
+      SilentReportMode(),
+      [
+        FileHandler(await getLogsPath()),
+        ConsoleHandler(
+          enableDeviceParameters: false,
+          enableApplicationParameters: false,
+        )
+      ],
+    );
+
     final Catcher2Options releaseConfig = Catcher2Options(
       SilentReportMode(),
       [FileHandler(await getLogsPath())],
     );
 
     Catcher2(
+      debugConfig: debugConfig,
       releaseConfig: releaseConfig,
       runAppFunction: () {
         runApp(const MyApp());
@@ -52,19 +61,16 @@ void main() async {
     );
 
     // 小白条、导航栏沉浸
-  if (Platform.isAndroid) {
-    final androidInfo = await DeviceInfoPlugin().androidInfo;
-    if (androidInfo.version.sdkInt >= 29) {
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    }
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
       systemNavigationBarColor: Colors.transparent,
       systemNavigationBarDividerColor: Colors.transparent,
       statusBarColor: Colors.transparent,
     ));
-  }
+    Data.init();
-
+    GStrorage.lazyInit();
     PiliSchame.init();
+  });
 }
 
 class MyApp extends StatelessWidget {
@@ -105,39 +111,6 @@ class MyApp extends StatelessWidget {
       } catch (_) {}
     }
 
-    if (Platform.isAndroid) {
-      return AndroidApp(
-        brandColor: brandColor,
-        isDynamicColor: isDynamicColor,
-        currentThemeValue: currentThemeValue,
-        textScale: textScale,
-      );
-    } else {
-      return OtherApp(
-        brandColor: brandColor,
-        currentThemeValue: currentThemeValue,
-        textScale: textScale,
-      );
-    }
-  }
-}
-
-class AndroidApp extends StatelessWidget {
-  const AndroidApp({
-    super.key,
-    required this.brandColor,
-    required this.isDynamicColor,
-    required this.currentThemeValue,
-    required this.textScale,
-  });
-
-  final Color brandColor;
-  final bool isDynamicColor;
-  final ThemeType currentThemeValue;
-  final double textScale;
-
-  @override
-  Widget build(BuildContext context) {
     return DynamicColorBuilder(
       builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
         ColorScheme? lightColorScheme;
@@ -157,77 +130,23 @@ class AndroidApp extends StatelessWidget {
             brightness: Brightness.dark,
           );
         }
-        return BuildMainApp(
+        // 图片缓存
-          lightColorScheme: lightColorScheme,
+        // PaintingBinding.instance.imageCache.maximumSizeBytes = 1000 << 20;
-          darkColorScheme: darkColorScheme,
+        return GetMaterialApp(
-          currentThemeValue: currentThemeValue,
+          title: 'PiLiPaLa',
-          textScale: textScale,
+          theme: ThemeData(
-        );
+            // fontFamily: 'HarmonyOS',
-      }),
+            colorScheme: currentThemeValue == ThemeType.dark
-    );
+                ? darkColorScheme
-  }
+                : lightColorScheme,
-}
+            useMaterial3: true,
-
+            snackBarTheme: SnackBarThemeData(
-class OtherApp extends StatelessWidget {
-  const OtherApp({
-    super.key,
-    required this.brandColor,
-    required this.currentThemeValue,
-    required this.textScale,
-  });
-
-  final Color brandColor;
-  final ThemeType currentThemeValue;
-  final double textScale;
-
-  @override
-  Widget build(BuildContext context) {
-    return BuildMainApp(
-      lightColorScheme: ColorScheme.fromSeed(
-        seedColor: brandColor,
-        brightness: Brightness.light,
-      ),
-      darkColorScheme: ColorScheme.fromSeed(
-        seedColor: brandColor,
-        brightness: Brightness.dark,
-      ),
-      currentThemeValue: currentThemeValue,
-      textScale: textScale,
-    );
-  }
-}
-
-class BuildMainApp extends StatelessWidget {
-  const BuildMainApp({
-    super.key,
-    required this.lightColorScheme,
-    required this.darkColorScheme,
-    required this.currentThemeValue,
-    required this.textScale,
-  });
-
-  final ColorScheme lightColorScheme;
-  final ColorScheme darkColorScheme;
-  final ThemeType currentThemeValue;
-  final double textScale;
-
-  @override
-  Widget build(BuildContext context) {
-    final SnackBarThemeData snackBarTheme = SnackBarThemeData(
               actionTextColor: lightColorScheme.primary,
               backgroundColor: lightColorScheme.secondaryContainer,
               closeIconColor: lightColorScheme.secondary,
               contentTextStyle: TextStyle(color: lightColorScheme.secondary),
               elevation: 20,
-    );
+            ),
-
-    return GetMaterialApp(
-      title: 'PiliPala',
-      theme: ThemeData(
-        colorScheme: currentThemeValue == ThemeType.dark
-            ? darkColorScheme
-            : lightColorScheme,
-        snackBarTheme: snackBarTheme,
             pageTransitionsTheme: const PageTransitionsTheme(
               builders: <TargetPlatform, PageTransitionsBuilder>{
                 TargetPlatform.android: ZoomPageTransitionsBuilder(
@@ -237,10 +156,18 @@ class BuildMainApp extends StatelessWidget {
             ),
           ),
           darkTheme: ThemeData(
+            // fontFamily: 'HarmonyOS',
             colorScheme: currentThemeValue == ThemeType.light
                 ? lightColorScheme
                 : darkColorScheme,
-        snackBarTheme: snackBarTheme,
+            useMaterial3: true,
+            snackBarTheme: SnackBarThemeData(
+              actionTextColor: darkColorScheme.primary,
+              backgroundColor: darkColorScheme.secondaryContainer,
+              closeIconColor: darkColorScheme.secondary,
+              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
+              elevation: 20,
+            ),
           ),
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,
@@ -266,11 +193,8 @@ class BuildMainApp extends StatelessWidget {
             VideoDetailPage.routeObserver,
             SearchPage.routeObserver,
           ],
-      onInit: () {
+        );
-        RecommendFilter();
+      }),
-        Data.init();
-        GlobalData();
-      },
     );
   }
 }

lib/models/bangumi/list.dart

@@ -30,7 +30,6 @@ class BangumiListItemModel {
   BangumiListItemModel({
     this.badge,
     this.badgeType,
-    this.pic,
     this.cover,
     // this.firstEp,
     this.indexShow,
@@ -51,7 +50,6 @@ class BangumiListItemModel {
 
   String? badge;
   int? badgeType;
-  String? pic;
   String? cover;
   String? indexShow;
   int? isFinish;
@@ -72,7 +70,6 @@ class BangumiListItemModel {
   BangumiListItemModel.fromJson(Map<String, dynamic> json) {
     badge = json['badge'] == '' ? null : json['badge'];
     badgeType = json['badge_type'];
-    pic = json['cover'];
     cover = json['cover'];
     indexShow = json['index_show'];
     isFinish = json['is_finish'];

lib/models/common/action_type.dart

@@ -1,93 +0,0 @@
-// 操作类型的枚举值：点赞 不喜欢 收藏 投币 稍后再看 下载封面 后台播放 听视频 分享 下载视频
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-enum ActionType {
-  like,
-  coin,
-  collect,
-  watchLater,
-  share,
-  dislike,
-  downloadCover,
-  copyLink,
-  // backgroundPlay,
-  // listenVideo,
-  // downloadVideo,
-}
-
-extension ActionTypeExtension on ActionType {
-  String get value => [
-        'like',
-        'coin',
-        'collect',
-        'watchLater',
-        'share',
-        'dislike',
-        'downloadCover',
-        'copyLink',
-        // 'backgroundPlay',
-        // 'listenVideo',
-        // 'downloadVideo',
-      ][index];
-  String get label => [
-        '点赞视频',
-        '投币',
-        '收藏视频',
-        '稍后再看',
-        '视频分享',
-        '不喜欢',
-        '下载封面',
-        '复制链接',
-        // '后台播放',
-        // '听视频',
-        // '下载视频',
-      ][index];
-}
-
-List<Map> actionMenuConfig = [
-  {
-    'icon': const Icon(Icons.thumb_up_alt_outlined),
-    'label': '点赞视频',
-    'value': ActionType.like,
-  },
-  {
-    'icon': Image.asset(
-      'assets/images/coin.png',
-      width: 26,
-      color: IconTheme.of(Get.context!).color!.withOpacity(0.65),
-    ),
-    'label': '投币',
-    'value': ActionType.coin,
-  },
-  {
-    'icon': const Icon(Icons.star_border),
-    'label': '收藏视频',
-    'value': ActionType.collect,
-  },
-  {
-    'icon': const Icon(Icons.watch_later_outlined),
-    'label': '稍后再看',
-    'value': ActionType.watchLater,
-  },
-  {
-    'icon': const Icon(Icons.share),
-    'label': '视频分享',
-    'value': ActionType.share,
-  },
-  {
-    'icon': const Icon(Icons.thumb_down_alt_outlined),
-    'label': '不喜欢',
-    'value': ActionType.dislike,
-  },
-  {
-    'icon': const Icon(Icons.image_outlined),
-    'label': '下载封面',
-    'value': ActionType.downloadCover,
-  },
-  {
-    'icon': const Icon(Icons.link_outlined),
-    'label': '复制链接',
-    'value': ActionType.copyLink,
-  },
-];

lib/models/common/dynamics_type.dart

@@ -7,5 +7,5 @@ enum DynamicsType {
 
 extension BusinessTypeExtension on DynamicsType {
   String get values => ['all', 'video', 'pgc', 'article'][index];
-  String get labels => ['全部', '投稿', '番剧', '专栏'][index];
+  String get labels => ['全部', '视频', '追番', '专栏'][index];
 }

lib/models/common/gesture_mode.dart

@@ -1,12 +0,0 @@
-enum FullScreenGestureMode {
-  /// 从上滑到下
-  fromToptoBottom,
-
-  /// 从下滑到上
-  fromBottomtoTop,
-}
-
-extension FullScreenGestureModeExtension on FullScreenGestureMode {
-  String get values => ['fromToptoBottom', 'fromBottomtoTop'][index];
-  String get labels => ['从上往下滑进入全屏', '从下往上滑进入全屏'][index];
-}

lib/models/common/index.dart

@@ -1,4 +0,0 @@
-library commonn_model;
-
-export './business_type.dart';
-export './gesture_mode.dart';

lib/models/common/nav_bar_config.dart

@@ -1,65 +0,0 @@
-import 'package:flutter/material.dart';
-
-import '../../pages/dynamics/index.dart';
-import '../../pages/home/index.dart';
-import '../../pages/media/index.dart';
-import '../../pages/rank/index.dart';
-
-List defaultNavigationBars = [
-  {
-    'id': 0,
-    'icon': const Icon(
-      Icons.home_outlined,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.home,
-      size: 21,
-    ),
-    'label': "首页",
-    'count': 0,
-    'page': const HomePage(),
-  },
-  {
-    'id': 1,
-    'icon': const Icon(
-      Icons.trending_up,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.trending_up_outlined,
-      size: 21,
-    ),
-    'label': "排行榜",
-    'count': 0,
-    'page': const RankPage(),
-  },
-  {
-    'id': 2,
-    'icon': const Icon(
-      Icons.motion_photos_on_outlined,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.motion_photos_on,
-      size: 21,
-    ),
-    'label': "动态",
-    'count': 0,
-    'page': const DynamicsPage(),
-  },
-  {
-    'id': 3,
-    'icon': const Icon(
-      Icons.video_collection_outlined,
-      size: 20,
-    ),
-    'selectIcon': const Icon(
-      Icons.video_collection,
-      size: 21,
-    ),
-    'label': "媒体库",
-    'count': 0,
-    'page': const MediaPage(),
-  }
-];

lib/models/common/rank_type.dart

@@ -1,222 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:pilipala/pages/rank/zone/index.dart';
-
-enum RandType {
-  all,
-  creation,
-  animation,
-  music,
-  dance,
-  game,
-  knowledge,
-  technology,
-  sport,
-  car,
-  life,
-  food,
-  animal,
-  madness,
-  fashion,
-  entertainment,
-  film,
-  origin,
-  rookie
-}
-
-extension RankTypeDesc on RandType {
-  String get description => [
-        '全站',
-        '国创相关',
-        '动画',
-        '音乐',
-        '舞蹈',
-        '游戏',
-        '知识',
-        '科技',
-        '运动',
-        '汽车',
-        '生活',
-        '美食',
-        '动物圈',
-        '鬼畜',
-        '时尚',
-        '娱乐',
-        '影视'
-      ][index];
-
-  String get id => [
-        'all',
-        'creation',
-        'animation',
-        'music',
-        'dance',
-        'game',
-        'knowledge',
-        'technology',
-        'sport',
-        'car',
-        'life',
-        'food',
-        'animal',
-        'madness',
-        'fashion',
-        'entertainment',
-        'film'
-      ][index];
-}
-
-List tabsConfig = [
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '全站',
-    'type': RandType.all,
-    'page': const ZonePage(rid: 0),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '国创相关',
-    'type': RandType.creation,
-    'page': const ZonePage(rid: 168),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '动画',
-    'type': RandType.animation,
-    'page': const ZonePage(rid: 1),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '音乐',
-    'type': RandType.music,
-    'page': const ZonePage(rid: 3),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '舞蹈',
-    'type': RandType.dance,
-    'page': const ZonePage(rid: 129),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '游戏',
-    'type': RandType.game,
-    'page': const ZonePage(rid: 4),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '知识',
-    'type': RandType.knowledge,
-    'page': const ZonePage(rid: 36),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '科技',
-    'type': RandType.technology,
-    'page': const ZonePage(rid: 188),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '运动',
-    'type': RandType.sport,
-    'page': const ZonePage(rid: 234),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '汽车',
-    'type': RandType.car,
-    'page': const ZonePage(rid: 223),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '生活',
-    'type': RandType.life,
-    'page': const ZonePage(rid: 160),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '美食',
-    'type': RandType.food,
-    'page': const ZonePage(rid: 211),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '动物圈',
-    'type': RandType.animal,
-    'page': const ZonePage(rid: 217),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '鬼畜',
-    'type': RandType.madness,
-    'page': const ZonePage(rid: 119),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '时尚',
-    'type': RandType.fashion,
-    'page': const ZonePage(rid: 155),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '娱乐',
-    'type': RandType.entertainment,
-    'page': const ZonePage(rid: 5),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '影视',
-    'type': RandType.film,
-    'page': const ZonePage(rid: 181),
-  }
-];

lib/models/common/rcmd_type.dart

@@ -1,7 +1,7 @@
 // 首页推荐类型
-enum RcmdType { web, app, notLogin }
+enum RcmdType { web, app }
 
 extension RcmdTypeExtension on RcmdType {
-  String get values => ['web', 'app', 'notLogin'][index];
+  String get values => ['web', 'app'][index];
-  String get labels => ['web端', 'app端', '游客模式'][index];
+  String get labels => ['web端', 'app端'][index];
 }

lib/models/common/reply_sort_type.dart

@@ -1,6 +1,6 @@
-enum ReplySortType { time, like }
+enum ReplySortType { time, like, reply }
 
 extension ReplySortTypeExtension on ReplySortType {
-  String get titles => ['最新评论', '最热评论'][index];
+  String get titles => ['最新评论', '最热评论', '回复最多'][index];
-  String get labels => ['最新', '最热'][index];
+  String get labels => ['最新', '最热', '最多回复'][index];
 }

lib/models/common/subtitle_type.dart

@@ -1,95 +0,0 @@
-enum SubtitleType {
-  // 中文（中国）
-  zhCN,
-  // 中文（自动翻译）
-  aizh,
-  // 英语（自动生成）
-  aien,
-  // 中文（简体）
-  zhHans,
-  // 英文（美国）
-  enUS,
-  // 中文繁体
-  zhTW,
-  //
-  en,
-  //
-  pt,
-  //
-  es,
-}
-
-extension SubtitleTypeExtension on SubtitleType {
-  String get description {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return '中文（中国）';
-      case SubtitleType.aizh:
-        return '中文（自动翻译）';
-      case SubtitleType.aien:
-        return '英语（自动生成）';
-      case SubtitleType.zhHans:
-        return '中文（简体）';
-      case SubtitleType.enUS:
-        return '英文（美国）';
-      case SubtitleType.zhTW:
-        return '中文（繁体）';
-      case SubtitleType.en:
-        return '英文';
-      case SubtitleType.pt:
-        return '葡萄牙语';
-      case SubtitleType.es:
-        return '西班牙语';
-    }
-  }
-}
-
-extension SubtitleIdExtension on SubtitleType {
-  String get id {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 'zh-CN';
-      case SubtitleType.aizh:
-        return 'ai-zh';
-      case SubtitleType.aien:
-        return 'ai-en';
-      case SubtitleType.zhHans:
-        return 'zh-Hans';
-      case SubtitleType.enUS:
-        return 'en-US';
-      case SubtitleType.zhTW:
-        return 'zh-TW';
-      case SubtitleType.en:
-        return 'en';
-      case SubtitleType.pt:
-        return 'pt';
-      case SubtitleType.es:
-        return 'es';
-    }
-  }
-}
-
-extension SubtitleCodeExtension on SubtitleType {
-  int get code {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 1;
-      case SubtitleType.aizh:
-        return 2;
-      case SubtitleType.aien:
-        return 3;
-      case SubtitleType.zhHans:
-        return 4;
-      case SubtitleType.enUS:
-        return 5;
-      case SubtitleType.zhTW:
-        return 6;
-      case SubtitleType.en:
-        return 7;
-      case SubtitleType.pt:
-        return 8;
-      case SubtitleType.es:
-        return 9;
-    }
-  }
-}

lib/models/common/video_episode_type.dart

@@ -1,5 +0,0 @@
-enum VideoEpidoesType {
-  videoEpisode,
-  videoPart,
-  bangumiEpisode,
-}

lib/models/dynamics/result.dart

@@ -414,8 +414,6 @@ class DynamicMajorModel {
     this.none,
     this.type,
     this.courses,
-    this.common,
-    this.music,
   });
 
   DynamicArchiveModel? archive;
@@ -431,8 +429,6 @@ class DynamicMajorModel {
   // MAJOR_TYPE_OPUS 图文/文章
   String? type;
   Map? courses;
-  Map? common;
-  Map? music;
 
   DynamicMajorModel.fromJson(Map<String, dynamic> json) {
     archive = json['archive'] != null
@@ -456,8 +452,6 @@ class DynamicMajorModel {
         json['none'] != null ? DynamicNoneModel.fromJson(json['none']) : null;
     type = json['type'];
     courses = json['courses'] ?? {};
-    common = json['common'] ?? {};
-    music = json['music'] ?? {};
   }
 }
 

lib/models/dynamics/up.dart

@@ -2,28 +2,18 @@ class FollowUpModel {
   FollowUpModel({
     this.liveUsers,
     this.upList,
-    this.liveList,
-    this.myInfo,
   });
 
   LiveUsers? liveUsers;
   List<UpItem>? upList;
-  List<LiveUserItem>? liveList;
-  MyInfo? myInfo;
 
   FollowUpModel.fromJson(Map<String, dynamic> json) {
     liveUsers = json['live_users'] != null
         ? LiveUsers.fromJson(json['live_users'])
         : null;
-    liveList = json['live_users'] != null
-        ? json['live_users']['items']
-            .map<LiveUserItem>((e) => LiveUserItem.fromJson(e))
-            .toList()
-        : [];
     upList = json['up_list'] != null
         ? json['up_list'].map<UpItem>((e) => UpItem.fromJson(e)).toList()
         : [];
-    myInfo = json['my_info'] != null ? MyInfo.fromJson(json['my_info']) : null;
   }
 }
 
@@ -103,21 +93,3 @@ class UpItem {
     uname = json['uname'];
   }
 }
-
-class MyInfo {
-  MyInfo({
-    this.face,
-    this.mid,
-    this.name,
-  });
-
-  String? face;
-  int? mid;
-  String? name;
-
-  MyInfo.fromJson(Map<String, dynamic> json) {
-    face = json['face'];
-    mid = json['mid'];
-    name = json['name'];
-  }
-}

lib/models/home/rcmd/result.dart

@@ -1,5 +1,3 @@
-import 'package:pilipala/utils/id_utils.dart';
-
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -30,7 +28,7 @@ class RecVideoItemAppModel {
   int? cid;
   String? pic;
   RcmdStat? stat;
-  int? duration;
+  String? duration;
   String? title;
   int? isFollowed;
   RcmdOwner? owner;
@@ -52,33 +50,17 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = json['player_args'] != null
+    bvid = null;
-        ? IdUtils.av2bv(json['player_args']['aid'])
-        : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
-    // 改用player_args中的duration作为原始数据（秒数）
+    duration = json['cover_right_text'];
-    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端接口等效
-    RegExp regex = RegExp(r'已关注|新关注');
-    isFollowed = rcmdReason != null &&
-            rcmdReason!.content != null &&
-            regex.hasMatch(rcmdReason!.content!)
-        ? 1
-        : 0;
-    // 如果是，就无需再显示推荐原因，交由view统一处理即可
-    if (isFollowed == 1) {
-      rcmdReason = null;
-    }
     goto = json['goto'];
     param = int.parse(json['param']);
     uri = json['uri'];

lib/models/live/quality.dart

@@ -1,43 +0,0 @@
-enum LiveQuality {
-  dolby,
-  super4K,
-  origin,
-  bluRay,
-  superHD,
-  smooth,
-  flunt,
-}
-
-extension LiveQualityCode on LiveQuality {
-  static final List<int> _codeList = [
-    30000,
-    20000,
-    10000,
-    400,
-    250,
-    150,
-    80,
-  ];
-  int get code => _codeList[index];
-
-  static LiveQuality? fromCode(int code) {
-    final index = _codeList.indexOf(code);
-    if (index != -1) {
-      return LiveQuality.values[index];
-    }
-    return null;
-  }
-}
-
-extension VideoQualityDesc on LiveQuality {
-  static final List<String> _descList = [
-    '杜比',
-    '4K',
-    '原画',
-    '蓝光',
-    '超清',
-    '高清',
-    '流畅',
-  ];
-  get description => _descList[index];
-}

lib/models/live/room_info_h5.dart

@@ -1,130 +0,0 @@
-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'];
-  }
-}

lib/models/member/archive.dart

@@ -142,7 +142,7 @@ class Stat {
 
   Stat.fromJson(Map<String, dynamic> json) {
     view = json["play"];
-    danmaku = json['video_review'];
+    danmaku = json['comment'];
   }
 }
 

lib/models/member/info.dart

@@ -47,23 +47,18 @@ class Vip {
     this.status,
     this.dueDate,
     this.label,
-    this.nicknameColor,
   });
 
   int? type;
   int? status;
   int? dueDate;
   Map? label;
-  int? nicknameColor;
 
   Vip.fromJson(Map<String, dynamic> json) {
     type = json['type'];
     status = json['status'];
     dueDate = json['due_date'];
     label = json['label'];
-    nicknameColor = json['nickname_color'] == ''
-        ? null
-        : int.parse("0xFF${json['nickname_color'].replaceAll('#', '')}");
   }
 }
 

lib/models/model_hot_video_item.dart

@@ -23,7 +23,6 @@ class HotVideoItemModel {
     this.dimension,
     this.shortLinkV2,
     this.firstFrame,
-    this.cover,
     this.pubLocation,
     this.seasontype,
     this.isOgv,
@@ -51,7 +50,6 @@ class HotVideoItemModel {
   Dimension? dimension;
   String? shortLinkV2;
   String? firstFrame;
-  String? cover;
   String? pubLocation;
   int? seasontype;
   bool? isOgv;
@@ -79,7 +77,6 @@ class HotVideoItemModel {
     dimension = Dimension.fromMap(json['dimension']);
     shortLinkV2 = json["short_link_v2"];
     firstFrame = json["first_frame"];
-    cover = json["first_frame"];
     pubLocation = json["pub_location"];
     seasontype = json["seasontype"];
     isOgv = json["isOgv"];

lib/models/model_rec_video_item.dart

@@ -1,3 +1,5 @@
+import 'package:pilipala/utils/utils.dart';
+
 import './model_owner.dart';
 import 'package:hive/hive.dart';
 
@@ -36,7 +38,7 @@ class RecVideoItemModel {
   @HiveField(6)
   String? title = '';
   @HiveField(7)
-  int? duration = -1;
+  String? duration = '';
   @HiveField(8)
   int? pubdate = -1;
   @HiveField(9)
@@ -56,7 +58,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = json["duration"];
+    duration = Utils.tampToSeektime(json["duration"]);
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
@@ -75,15 +77,14 @@ class Stat {
     this.danmu,
   });
   @HiveField(0)
-  int? view;
+  String? view;
   @HiveField(1)
   int? like;
   @HiveField(2)
   int? danmu;
 
   Stat.fromJson(Map<String, dynamic> json) {
-    // 无需在model中转换以保留原始数据，在view层处理即可
+    view = Utils.numFormat(json["view"]);
-    view = json["view"];
     like = json["like"];
     danmu = json['danmaku'];
   }

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 int?,
+      duration: fields[7] as String?,
       pubdate: fields[8] as int?,
       owner: fields[9] as Owner?,
       stat: fields[10] as Stat?,
@@ -87,7 +87,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return Stat(
-      view: fields[0] as int?,
+      view: fields[0] as String?,
       like: fields[1] as int?,
       danmu: fields[2] as int?,
     );

lib/models/msg/like.dart

@@ -1,183 +0,0 @@
-class MessageLikeModel {
-  MessageLikeModel({
-    this.latest,
-    this.total,
-  });
-
-  Latest? latest;
-  Total? total;
-
-  factory MessageLikeModel.fromJson(Map<String, dynamic> json) =>
-      MessageLikeModel(
-        latest: json["latest"] == null ? null : Latest.fromJson(json["latest"]),
-        total: json["total"] == null ? null : Total.fromJson(json["total"]),
-      );
-}
-
-class Latest {
-  Latest({
-    this.items,
-    this.lastViewAt,
-  });
-
-  List? items;
-  int? lastViewAt;
-
-  factory Latest.fromJson(Map<String, dynamic> json) => Latest(
-        items: json["items"],
-        lastViewAt: json["last_view_at"],
-      );
-}
-
-class Total {
-  Total({
-    this.cursor,
-    this.items,
-  });
-
-  Cursor? cursor;
-  List<MessageLikeItem>? items;
-
-  factory Total.fromJson(Map<String, dynamic> json) => Total(
-        cursor: Cursor.fromJson(json['cursor']),
-        items: json["items"] == null
-            ? []
-            : json["items"].map<MessageLikeItem>((e) {
-                return MessageLikeItem.fromJson(e);
-              }).toList(),
-      );
-}
-
-class Cursor {
-  Cursor({
-    this.id,
-    this.isEnd,
-    this.time,
-  });
-
-  int? id;
-  bool? isEnd;
-  int? time;
-
-  factory Cursor.fromJson(Map<String, dynamic> json) => Cursor(
-        id: json['id'],
-        isEnd: json['is_end'],
-        time: json['time'],
-      );
-}
-
-class MessageLikeItem {
-  MessageLikeItem({
-    this.id,
-    this.users,
-    this.item,
-    this.counts,
-    this.likeTime,
-    this.noticeState,
-    this.isExpand = false,
-  });
-
-  int? id;
-  List<MessageLikeUser>? users;
-  MessageLikeItemItem? item;
-  int? counts;
-  int? likeTime;
-  int? noticeState;
-  bool isExpand;
-
-  factory MessageLikeItem.fromJson(Map<String, dynamic> json) =>
-      MessageLikeItem(
-        id: json["id"],
-        users: json["users"] == null
-            ? []
-            : json["users"].map<MessageLikeUser>((e) {
-                return MessageLikeUser.fromJson(e);
-              }).toList(),
-        item: json["item"] == null
-            ? null
-            : MessageLikeItemItem.fromJson(json["item"]),
-        counts: json["counts"],
-        likeTime: json["like_time"],
-        noticeState: json["notice_state"],
-      );
-}
-
-class MessageLikeUser {
-  MessageLikeUser({
-    this.mid,
-    this.fans,
-    this.nickname,
-    this.avatar,
-    this.midLink,
-    this.follow,
-  });
-
-  int? mid;
-  int? fans;
-  String? nickname;
-  String? avatar;
-  String? midLink;
-  bool? follow;
-
-  factory MessageLikeUser.fromJson(Map<String, dynamic> json) =>
-      MessageLikeUser(
-        mid: json["mid"],
-        fans: json["fans"],
-        nickname: json["nickname"],
-        avatar: json["avatar"],
-        midLink: json["mid_link"],
-        follow: json["follow"],
-      );
-}
-
-class MessageLikeItemItem {
-  MessageLikeItemItem({
-    this.itemId,
-    this.pid,
-    this.type,
-    this.business,
-    this.businessId,
-    this.replyBusinessId,
-    this.likeBusinessId,
-    this.title,
-    this.desc,
-    this.image,
-    this.uri,
-    this.detailName,
-    this.nativeUri,
-    this.ctime,
-  });
-
-  int? itemId;
-  int? pid;
-  String? type;
-  String? business;
-  int? businessId;
-  int? replyBusinessId;
-  int? likeBusinessId;
-  String? title;
-  String? desc;
-  String? image;
-  String? uri;
-  String? detailName;
-  String? nativeUri;
-  int? ctime;
-
-  factory MessageLikeItemItem.fromJson(Map<String, dynamic> json) =>
-      MessageLikeItemItem(
-        itemId: json["item_id"],
-        pid: json["pid"],
-        type: json["type"],
-        business: json["business"],
-        businessId: json["business_id"],
-        replyBusinessId: json["reply_business_id"],
-        likeBusinessId: json["like_business_id"],
-        title: json["title"],
-        desc: json["desc"],
-        image: json["image"],
-        uri: json["uri"],
-        detailName: json["detail_name"],
-        nativeUri: json["native_uri"],
-        ctime: json["ctime"],
-      );
-}

lib/models/msg/reply.dart

@@ -1,168 +0,0 @@
-class MessageReplyModel {
-  MessageReplyModel({
-    this.cursor,
-    this.items,
-  });
-
-  Cursor? cursor;
-  List<MessageReplyItem>? items;
-
-  MessageReplyModel.fromJson(Map<String, dynamic> json) {
-    cursor = Cursor.fromJson(json['cursor']);
-    items = json["items"] != null
-        ? json["items"].map<MessageReplyItem>((e) {
-            return MessageReplyItem.fromJson(e);
-          }).toList()
-        : [];
-  }
-}
-
-class Cursor {
-  Cursor({
-    this.id,
-    this.isEnd,
-    this.time,
-  });
-
-  int? id;
-  bool? isEnd;
-  int? time;
-
-  Cursor.fromJson(Map<String, dynamic> json) {
-    id = json['id'];
-    isEnd = json['is_end'];
-    time = json['time'];
-  }
-}
-
-class MessageReplyItem {
-  MessageReplyItem({
-    this.count,
-    this.id,
-    this.isMulti,
-    this.item,
-    this.replyTime,
-    this.user,
-  });
-
-  int? count;
-  int? id;
-  int? isMulti;
-  ReplyContentItem? item;
-  int? replyTime;
-  ReplyUser? user;
-
-  MessageReplyItem.fromJson(Map<String, dynamic> json) {
-    count = json['count'];
-    id = json['id'];
-    isMulti = json['is_multi'];
-    item = ReplyContentItem.fromJson(json["item"]);
-    replyTime = json['reply_time'];
-    user = ReplyUser.fromJson(json['user']);
-  }
-}
-
-class ReplyContentItem {
-  ReplyContentItem({
-    this.subjectId,
-    this.rootId,
-    this.sourceId,
-    this.targetId,
-    this.type,
-    this.businessId,
-    this.business,
-    this.title,
-    this.desc,
-    this.image,
-    this.uri,
-    this.nativeUri,
-    this.detailTitle,
-    this.rootReplyContent,
-    this.sourceContent,
-    this.targetReplyContent,
-    this.atDetails,
-    this.topicDetails,
-    this.hideReplyButton,
-    this.hideLikeButton,
-    this.likeState,
-    this.danmu,
-    this.message,
-  });
-
-  int? subjectId;
-  int? rootId;
-  int? sourceId;
-  int? targetId;
-  String? type;
-  int? businessId;
-  String? business;
-  String? title;
-  String? desc;
-  String? image;
-  String? uri;
-  String? nativeUri;
-  String? detailTitle;
-  String? rootReplyContent;
-  String? sourceContent;
-  String? targetReplyContent;
-  List? atDetails;
-  List? topicDetails;
-  bool? hideReplyButton;
-  bool? hideLikeButton;
-  int? likeState;
-  String? danmu;
-  String? message;
-
-  ReplyContentItem.fromJson(Map<String, dynamic> json) {
-    subjectId = json['subject_id'];
-    rootId = json['root_id'];
-    sourceId = json['source_id'];
-    targetId = json['target_id'];
-    type = json['type'];
-    businessId = json['business_id'];
-    business = json['business'];
-    title = json['title'];
-    desc = json['desc'];
-    image = json['image'];
-    uri = json['uri'];
-    nativeUri = json['native_uri'];
-    detailTitle = json['detail_title'];
-    rootReplyContent = json['root_reply_content'];
-    sourceContent = json['source_content'];
-    targetReplyContent = json['target_reply_content'];
-    atDetails = json['at_details'];
-    topicDetails = json['topic_details'];
-    hideReplyButton = json['hide_reply_button'];
-    hideLikeButton = json['hide_like_button'];
-    likeState = json['like_state'];
-    danmu = json['danmu'];
-    message = json['message'];
-  }
-}
-
-class ReplyUser {
-  ReplyUser({
-    this.mid,
-    this.fans,
-    this.nickname,
-    this.avatar,
-    this.midLink,
-    this.follow,
-  });
-
-  int? mid;
-  int? fans;
-  String? nickname;
-  String? avatar;
-  String? midLink;
-  bool? follow;
-
-  ReplyUser.fromJson(Map<String, dynamic> json) {
-    mid = json['mid'];
-    fans = json['fans'];
-    nickname = json['nickname'];
-    avatar = json['avatar'];
-    midLink = json['mid_link'];
-    follow = json['follow'];
-  }
-}

lib/models/msg/session.dart

@@ -8,7 +8,7 @@ class SessionDataModel {
     this.hasMore,
   });
 
-  List<SessionList>? sessionList;
+  List? sessionList;
   int? hasMore;
 
   SessionDataModel.fromJson(Map<String, dynamic> json) {
@@ -121,37 +121,35 @@ class LastMsg {
     this.msgKey,
     this.msgStatus,
     this.notifyCode,
-    // this.newFaceVersion,
+    this.newFaceVersion,
   });
 
   int? senderIid;
   int? receiverType;
   int? receiverId;
   int? msgType;
-  dynamic content;
+  Map? content;
   int? msgSeqno;
   int? timestamp;
   String? atUids;
   int? msgKey;
   int? msgStatus;
   String? notifyCode;
-  // int? newFaceVersion;
+  int? newFaceVersion;
 
   LastMsg.fromJson(Map<String, dynamic> json) {
     senderIid = json['sender_uid'];
     receiverType = json['receiver_type'];
     receiverId = json['receiver_id'];
     msgType = json['msg_type'];
-    content = json['content'] != null && json['content'] != ''
+    content = jsonDecode(json['content']);
-        ? jsonDecode(json['content'])
-        : '';
     msgSeqno = json['msg_seqno'];
     timestamp = json['timestamp'];
     atUids = json['at_uids'];
     msgKey = json['msg_key'];
     msgStatus = json['msg_status'];
     notifyCode = json['notify_code'];
-    // newFaceVersion = json['new_face_version'];
+    newFaceVersion = json['new_face_version'];
   }
 }
 
@@ -216,9 +214,7 @@ class MessageItem {
     receiverId = json['receiver_id'];
     // 1 文本 2 图片 18 系统提示 10 系统通知  5 撤回的消息
     msgType = json['msg_type'];
-    content = json['content'] != null && json['content'] != ''
+    content = jsonDecode(json['content']);
-        ? jsonDecode(json['content'])
-        : '';
     msgSeqno = json['msg_seqno'];
     timestamp = json['timestamp'];
     atUids = json['at_uids'];

lib/models/search/all.dart

@@ -1,9 +0,0 @@
-class SearchAllModel {
-  SearchAllModel({this.topTList});
-
-  Map? topTList;
-
-  SearchAllModel.fromJson(Map<String, dynamic> json) {
-    topTList = json['top_tlist'];
-  }
-}

lib/models/search/hot.dart

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

lib/models/search/hot.g.dart

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

lib/models/search/result.dart

@@ -5,9 +5,7 @@ class SearchVideoModel {
   SearchVideoModel({this.list});
   List<SearchVideoItemModel>? list;
   SearchVideoModel.fromJson(Map<String, dynamic> json) {
-    list = json['result'] == null
+    list = json['result']
-        ? []
-        : json['result']
         .where((e) => e['available'] == true)
         .map<SearchVideoItemModel>((e) => SearchVideoItemModel.fromJson(e))
         .toList();
@@ -27,7 +25,6 @@ class SearchVideoItemModel {
     this.aid,
     this.bvid,
     this.title,
-    this.titleList,
     this.description,
     this.pic,
     // this.play,
@@ -57,8 +54,8 @@ class SearchVideoItemModel {
   String? arcurl;
   int? aid;
   String? bvid;
-  String? title;
+  List? title;
-  List? titleList;
+  // List? titleList;
   String? description;
   String? pic;
   // String? play;
@@ -85,13 +82,10 @@ class SearchVideoItemModel {
     aid = json['aid'];
     bvid = json['bvid'];
     mid = json['mid'];
-    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
-    // title = Em.regTitle(json['title']);
+    title = Em.regTitle(json['title']);
-    titleList = Em.regTitle(json['title']);
     description = json['description'];
-    pic = json['pic'] != null && json['pic'].startsWith('//')
+    pic = 'https:${json['pic']}';
-        ? 'https:${json['pic']}'
-        : json['pic'] ?? '';
     videoReview = json['video_review'];
     pubdate = json['pubdate'];
     senddate = json['senddate'];
@@ -236,7 +230,6 @@ class SearchLiveItemModel {
     this.userCover,
     this.type,
     this.title,
-    this.titleList,
     this.cover,
     this.pic,
     this.online,
@@ -256,8 +249,7 @@ class SearchLiveItemModel {
   String? face;
   String? userCover;
   String? type;
-  String? title;
+  List? title;
-  List? titleList;
   String? cover;
   String? pic;
   int? online;
@@ -278,8 +270,7 @@ class SearchLiveItemModel {
     face = json['uface'];
     userCover = json['user_cover'];
     type = json['type'];
-    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    title = Em.regTitle(json['title']);
-    titleList = Em.regTitle(json['title']);
     cover = json['cover'];
     pic = json['cover'];
     online = json['online'];
@@ -309,7 +300,6 @@ class SearchMBangumiItemModel {
     this.type,
     this.mediaId,
     this.title,
-    this.titleList,
     this.orgTitle,
     this.mediaType,
     this.cv,
@@ -336,8 +326,7 @@ class SearchMBangumiItemModel {
 
   String? type;
   int? mediaId;
-  String? title;
+  List? title;
-  List? titleList;
   String? orgTitle;
   int? mediaType;
   String? cv;
@@ -364,8 +353,7 @@ class SearchMBangumiItemModel {
   SearchMBangumiItemModel.fromJson(Map<String, dynamic> json) {
     type = json['type'];
     mediaId = json['media_id'];
-    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    title = Em.regTitle(json['title']);
-    titleList = Em.regTitle(json['title']);
     orgTitle = json['org_title'];
     mediaType = json['media_type'];
     cv = json['cv'];
@@ -447,8 +435,7 @@ class SearchArticleItemModel {
     pubTime = json['pub_time'];
     like = json['like'];
     title = Em.regTitle(json['title']);
-    subTitle =
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
-        Em.decodeHtmlEntities(json['title'].replaceAll(RegExp(r'<[^>]*>'), ''));
     rankOffset = json['rank_offset'];
     mid = json['mid'];
     imageUrls = json['image_urls'];

lib/models/user/fav_folder.dart

@@ -15,7 +15,7 @@ class FavFolderData {
         ? json['list']
             .map<FavFolderItemData>((e) => FavFolderItemData.fromJson(e))
             .toList()
-        : <FavFolderItemData>[];
+        : [FavFolderItemData()];
     hasMore = json['has_more'];
   }
 }

lib/models/user/sub_detail.dart

@@ -1,123 +0,0 @@
-class SubDetailModelData {
-  DetailInfo? info;
-  List<SubDetailMediaItem>? medias;
-
-  SubDetailModelData({this.info, this.medias});
-
-  SubDetailModelData.fromJson(Map<String, dynamic> json) {
-    info = DetailInfo.fromJson(json['info']);
-    if (json['medias'] != null) {
-      medias = <SubDetailMediaItem>[];
-      json['medias'].forEach((v) {
-        medias!.add(SubDetailMediaItem.fromJson(v));
-      });
-    }
-  }
-}
-
-class SubDetailMediaItem {
-  int? id;
-  String? title;
-  String? cover;
-  String? pic;
-  int? duration;
-  int? pubtime;
-  String? bvid;
-  Map? upper;
-  Map? cntInfo;
-  int? enableVt;
-  String? vtDisplay;
-
-  SubDetailMediaItem({
-    this.id,
-    this.title,
-    this.cover,
-    this.pic,
-    this.duration,
-    this.pubtime,
-    this.bvid,
-    this.upper,
-    this.cntInfo,
-    this.enableVt,
-    this.vtDisplay,
-  });
-
-  SubDetailMediaItem.fromJson(Map<String, dynamic> json) {
-    id = json['id'];
-    title = json['title'];
-    cover = json['cover'];
-    pic = json['cover'];
-    duration = json['duration'];
-    pubtime = json['pubtime'];
-    bvid = json['bvid'];
-    upper = json['upper'];
-    cntInfo = json['cnt_info'];
-    enableVt = json['enable_vt'];
-    vtDisplay = json['vt_display'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final data = <String, dynamic>{};
-    data['id'] = id;
-    data['title'] = title;
-    data['cover'] = cover;
-    data['duration'] = duration;
-    data['pubtime'] = pubtime;
-    data['bvid'] = bvid;
-    data['upper'] = upper;
-    data['cnt_info'] = cntInfo;
-    data['enable_vt'] = enableVt;
-    data['vt_display'] = vtDisplay;
-    return data;
-  }
-}
-
-class DetailInfo {
-  int? id;
-  int? seasonType;
-  String? title;
-  String? cover;
-  Map? upper;
-  Map? cntInfo;
-  int? mediaCount;
-  String? intro;
-  int? enableVt;
-
-  DetailInfo({
-    this.id,
-    this.seasonType,
-    this.title,
-    this.cover,
-    this.upper,
-    this.cntInfo,
-    this.mediaCount,
-    this.intro,
-    this.enableVt,
-  });
-
-  DetailInfo.fromJson(Map<String, dynamic> json) {
-    id = json['id'];
-    seasonType = json['season_type'];
-    title = json['title'];
-    cover = json['cover'];
-    upper = json['upper'];
-    cntInfo = json['cnt_info'];
-    mediaCount = json['media_count'];
-    intro = json['intro'];
-    enableVt = json['enable_vt'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final data = <String, dynamic>{};
-    data['id'] = id;
-    data['season_type'] = seasonType;
-    data['title'] = title;
-    data['cover'] = cover;
-    data['upper'] = upper;
-    data['cnt_info'] = cntInfo;
-    data['media_count'] = mediaCount;
-    data['intro'] = intro;
-    data['enable_vt'] = enableVt;
-    return data;
-  }
-}

lib/models/user/sub_folder.dart

@@ -1,111 +0,0 @@
-class SubFolderModelData {
-  final int? count;
-  final List<SubFolderItemData>? list;
-
-  SubFolderModelData({
-    this.count,
-    this.list,
-  });
-
-  factory SubFolderModelData.fromJson(Map<String, dynamic> json) {
-    return SubFolderModelData(
-      count: json['count'],
-      list: json['list'] != null
-          ? (json['list'] as List)
-              .map<SubFolderItemData>((i) => SubFolderItemData.fromJson(i))
-              .toList()
-          : null,
-    );
-  }
-}
-
-class SubFolderItemData {
-  final int? id;
-  final int? fid;
-  final int? mid;
-  final int? attr;
-  final String? title;
-  final String? cover;
-  final Upper? upper;
-  final int? coverType;
-  final String? intro;
-  final int? ctime;
-  final int? mtime;
-  final int? state;
-  final int? favState;
-  final int? mediaCount;
-  final int? viewCount;
-  final int? vt;
-  final int? playSwitch;
-  final int? type;
-  final String? link;
-  final String? bvid;
-
-  SubFolderItemData({
-    this.id,
-    this.fid,
-    this.mid,
-    this.attr,
-    this.title,
-    this.cover,
-    this.upper,
-    this.coverType,
-    this.intro,
-    this.ctime,
-    this.mtime,
-    this.state,
-    this.favState,
-    this.mediaCount,
-    this.viewCount,
-    this.vt,
-    this.playSwitch,
-    this.type,
-    this.link,
-    this.bvid,
-  });
-
-  factory SubFolderItemData.fromJson(Map<String, dynamic> json) {
-    return SubFolderItemData(
-      id: json['id'],
-      fid: json['fid'],
-      mid: json['mid'],
-      attr: json['attr'],
-      title: json['title'],
-      cover: json['cover'],
-      upper: json['upper'] != null ? Upper.fromJson(json['upper']) : null,
-      coverType: json['cover_type'],
-      intro: json['intro'],
-      ctime: json['ctime'],
-      mtime: json['mtime'],
-      state: json['state'],
-      favState: json['fav_state'],
-      mediaCount: json['media_count'],
-      viewCount: json['view_count'],
-      vt: json['vt'],
-      playSwitch: json['play_switch'],
-      type: json['type'],
-      link: json['link'],
-      bvid: json['bvid'],
-    );
-  }
-}
-
-class Upper {
-  final int? mid;
-  final String? name;
-  final String? face;
-
-  Upper({
-    this.mid,
-    this.name,
-    this.face,
-  });
-
-  factory Upper.fromJson(Map<String, dynamic> json) {
-    return Upper(
-      mid: json['mid'],
-      name: json['name'],
-      face: json['face'],
-    );
-  }
-}

lib/models/video/play/ao_output.dart

@@ -1,6 +0,0 @@
-final List aoOutputList = [
-  {'title': 'audiotrack,opensles', 'value': '0'},
-  {'title': 'opensles,audiotrack', 'value': '1'},
-  {'title': 'audiotrack', 'value': '2'},
-  {'title': 'opensles', 'value': '3'},
-];

lib/models/video/play/quality.dart

@@ -39,14 +39,6 @@ extension VideoQualityCode on VideoQuality {
     }
     return null;
   }
-
-  static int? toCode(VideoQuality quality) {
-    final index = VideoQuality.values.indexOf(quality);
-    if (index != -1 && index < _codeList.length) {
-      return _codeList[index];
-    }
-    return null;
-  }
 }
 
 extension VideoQualityDesc on VideoQuality {

lib/models/video/play/url.dart

@@ -34,7 +34,6 @@ class PlayUrlModel {
   String? seekParam;
   String? seekType;
   Dash? dash;
-  List<Durl>? durl;
   List<FormatItem>? supportFormats;
   // String? highFormat;
   int? lastPlayTime;
@@ -53,8 +52,7 @@ class PlayUrlModel {
     videoCodecid = json['video_codecid'];
     seekParam = json['seek_param'];
     seekType = json['seek_type'];
-    dash = json['dash'] != null ? Dash.fromJson(json['dash']) : null;
+    dash = Dash.fromJson(json['dash']);
-    durl = json['durl']?.map<Durl>((e) => Durl.fromJson(e)).toList();
     supportFormats = json['support_formats'] != null
         ? json['support_formats']
             .map<FormatItem>((e) => FormatItem.fromJson(e))
@@ -252,30 +250,3 @@ class Flac {
     audio = json['audio'] != null ? AudioItem.fromJson(json['audio']) : null;
   }
 }
-
-class Durl {
-  Durl({
-    this.order,
-    this.length,
-    this.size,
-    this.ahead,
-    this.vhead,
-    this.url,
-  });
-
-  int? order;
-  int? length;
-  int? size;
-  String? ahead;
-  String? vhead;
-  String? url;
-
-  Durl.fromJson(Map<String, dynamic> json) {
-    order = json['order'];
-    length = json['length'];
-    size = json['size'];
-    ahead = json['ahead'];
-    vhead = json['vhead'];
-    url = json['url'];
-  }
-}

lib/models/video/reply/content.dart

@@ -9,7 +9,6 @@ class ReplyContent {
     this.vote,
     this.richText,
     this.isText,
-    this.topicsMeta,
   });
 
   String? message;
@@ -21,7 +20,6 @@ class ReplyContent {
   Map? vote;
   Map? richText;
   bool? isText;
-  Map? topicsMeta;
 
   ReplyContent.fromJson(Map<String, dynamic> json) {
     message = json['message']
@@ -41,7 +39,6 @@ class ReplyContent {
     richText = json['rich_text'] ?? {};
     // 不包含@ 笔记 图片的时候，文字可折叠
     isText = atNameToMid!.isEmpty && vote!.isEmpty && pictures!.isEmpty;
-    topicsMeta = json['topics_meta'] ?? {};
   }
 }
 

lib/models/video/reply/emote.dart

@@ -1,120 +0,0 @@
-class EmoteModelData {
-  final List<PackageItem>? packages;
-
-  EmoteModelData({
-    required this.packages,
-  });
-
-  factory EmoteModelData.fromJson(Map<String, dynamic> jsonRes) {
-    final List<PackageItem>? packages =
-        jsonRes['packages'] is List ? <PackageItem>[] : null;
-    if (packages != null) {
-      for (final dynamic item in jsonRes['packages']!) {
-        if (item != null) {
-          try {
-            packages.add(PackageItem.fromJson(item));
-          } catch (_) {}
-        }
-      }
-    }
-    return EmoteModelData(
-      packages: packages,
-    );
-  }
-}
-
-class PackageItem {
-  final int? id;
-  final String? text;
-  final String? url;
-  final int? mtime;
-  final int? type;
-  final int? attr;
-  final Meta? meta;
-  final List<Emote>? emote;
-
-  PackageItem({
-    required this.id,
-    required this.text,
-    required this.url,
-    required this.mtime,
-    required this.type,
-    required this.attr,
-    required this.meta,
-    required this.emote,
-  });
-
-  factory PackageItem.fromJson(Map<String, dynamic> jsonRes) {
-    final List<Emote>? emote = jsonRes['emote'] is List ? <Emote>[] : null;
-    if (emote != null) {
-      for (final dynamic item in jsonRes['emote']!) {
-        if (item != null) {
-          try {
-            emote.add(Emote.fromJson(item));
-          } catch (_) {}
-        }
-      }
-    }
-    return PackageItem(
-      id: jsonRes['id'],
-      text: jsonRes['text'],
-      url: jsonRes['url'],
-      mtime: jsonRes['mtime'],
-      type: jsonRes['type'],
-      attr: jsonRes['attr'],
-      meta: Meta.fromJson(jsonRes['meta']),
-      emote: emote,
-    );
-  }
-}
-
-class Meta {
-  final int? size;
-  final List<String>? suggest;
-
-  Meta({
-    required this.size,
-    required this.suggest,
-  });
-
-  factory Meta.fromJson(Map<String, dynamic> jsonRes) => Meta(
-        size: jsonRes['size'],
-        suggest: jsonRes['suggest'] is List ? <String>[] : null,
-      );
-}
-
-class Emote {
-  final int? id;
-  final int? packageId;
-  final String? text;
-  final String? url;
-  final int? mtime;
-  final int? type;
-  final int? attr;
-  final Meta? meta;
-  final dynamic activity;
-
-  Emote({
-    required this.id,
-    required this.packageId,
-    required this.text,
-    required this.url,
-    required this.mtime,
-    required this.type,
-    required this.attr,
-    required this.meta,
-    required this.activity,
-  });
-
-  factory Emote.fromJson(Map<String, dynamic> jsonRes) => Emote(
-        id: jsonRes['id'],
-        packageId: jsonRes['package_id'],
-        text: jsonRes['text'],
-        url: jsonRes['url'],
-        mtime: jsonRes['mtime'],
-        type: jsonRes['type'],
-        attr: jsonRes['attr'],
-        meta: Meta.fromJson(jsonRes['meta']),
-        activity: jsonRes['activity'],
-      );
-}

lib/models/video/subTitile/content.dart

@@ -1,20 +0,0 @@
-class SubTitileContentModel {
-  double? from;
-  double? to;
-  int? location;
-  String? content;
-
-  SubTitileContentModel({
-    this.from,
-    this.to,
-    this.location,
-    this.content,
-  });
-
-  SubTitileContentModel.fromJson(Map<String, dynamic> json) {
-    from = json['from'];
-    to = json['to'];
-    location = json['location'];
-    content = json['content'];
-  }
-}

lib/models/video/subTitile/result.dart

@@ -1,89 +0,0 @@
-import 'package:get/get.dart';
-import '../../common/subtitle_type.dart';
-
-class SubTitlteModel {
-  SubTitlteModel({
-    this.aid,
-    this.bvid,
-    this.cid,
-    this.loginMid,
-    this.loginMidHash,
-    this.isOwner,
-    this.name,
-    this.subtitles,
-  });
-
-  int? aid;
-  String? bvid;
-  int? cid;
-  int? loginMid;
-  String? loginMidHash;
-  bool? isOwner;
-  String? name;
-  List<SubTitlteItemModel>? subtitles;
-
-  factory SubTitlteModel.fromJson(Map<String, dynamic> json) => SubTitlteModel(
-        aid: json["aid"],
-        bvid: json["bvid"],
-        cid: json["cid"],
-        loginMid: json["login_mid"],
-        loginMidHash: json["login_mid_hash"],
-        isOwner: json["is_owner"],
-        name: json["name"],
-        subtitles: json["subtitle"] != null
-            ? json["subtitle"]["subtitles"]
-                .map<SubTitlteItemModel>((x) => SubTitlteItemModel.fromJson(x))
-                .toList()
-            : [],
-      );
-}
-
-class SubTitlteItemModel {
-  SubTitlteItemModel({
-    this.id,
-    this.lan,
-    this.lanDoc,
-    this.isLock,
-    this.subtitleUrl,
-    this.type,
-    this.aiType,
-    this.aiStatus,
-    this.title,
-    this.code,
-    this.content,
-    this.body,
-  });
-
-  int? id;
-  String? lan;
-  String? lanDoc;
-  bool? isLock;
-  String? subtitleUrl;
-  int? type;
-  int? aiType;
-  int? aiStatus;
-  String? title;
-  int? code;
-  String? content;
-  List? body;
-
-  factory SubTitlteItemModel.fromJson(Map<String, dynamic> json) =>
-      SubTitlteItemModel(
-        id: json["id"],
-        lan: json["lan"].replaceAll('-', ''),
-        lanDoc: json["lan_doc"],
-        isLock: json["is_lock"],
-        subtitleUrl: json["subtitle_url"],
-        type: json["type"],
-        aiType: json["ai_type"],
-        aiStatus: json["ai_status"],
-        title: json["lan_doc"],
-        code: SubtitleType.values
-                .firstWhereOrNull(
-                    (element) => element.id.toString() == json["lan"])
-                ?.index ??
-            -1,
-        content: '',
-        body: [],
-      );
-}

lib/models/video_detail_res.dart

@@ -67,7 +67,6 @@ class VideoDetailData {
   String? likeIcon;
   bool? needJumpBv;
   String? epId;
-  List<Staff>? staff;
 
   VideoDetailData({
     this.bvid,
@@ -104,7 +103,6 @@ class VideoDetailData {
     this.likeIcon,
     this.needJumpBv,
     this.epId,
-    this.staff,
   });
 
   VideoDetailData.fromJson(Map<String, dynamic> json) {
@@ -157,9 +155,6 @@ class VideoDetailData {
     if (json['redirect_url'] != null) {
       epId = resolveEpId(json['redirect_url']);
     }
-    staff = json["staff"] != null
-        ? List<Staff>.from(json["staff"]!.map((e) => Staff.fromJson(e)))
-        : null;
   }
 
   String resolveEpId(url) {
@@ -382,7 +377,6 @@ class Part {
   String? weblink;
   Dimension? dimension;
   String? firstFrame;
-  String? cover;
 
   Part({
     this.cid,
@@ -394,7 +388,6 @@ class Part {
     this.weblink,
     this.dimension,
     this.firstFrame,
-    this.cover,
   });
 
   fromRawJson(String str) => Part.fromJson(json.decode(str));
@@ -412,8 +405,7 @@ class Part {
     dimension = json["dimension"] == null
         ? null
         : Dimension.fromJson(json["dimension"]);
-    firstFrame = json["first_frame"] ?? '';
+    firstFrame = json["first_frame"];
-    cover = json["first_frame"] ?? '';
   }
 
   Map<String, dynamic> toJson() {
@@ -637,7 +629,6 @@ class EpisodeItem {
     this.attribute,
     this.page,
     this.bvid,
-    this.cover,
   });
   int? seasonId;
   int? sectionId;
@@ -648,7 +639,6 @@ class EpisodeItem {
   int? attribute;
   Part? page;
   String? bvid;
-  String? cover;
 
   EpisodeItem.fromJson(Map<String, dynamic> json) {
     seasonId = json['season_id'];
@@ -660,46 +650,5 @@ class EpisodeItem {
     attribute = json['attribute'];
     page = Part.fromJson(json['page']);
     bvid = json['bvid'];
-    cover = json['arc']['pic'];
-  }
-}
-
-class Staff {
-  Staff({
-    this.mid,
-    this.title,
-    this.name,
-    this.face,
-    this.vip,
-  });
-
-  int? mid;
-  String? title;
-  String? name;
-  String? face;
-  int? status;
-  Vip? vip;
-
-  Staff.fromJson(Map<String, dynamic> json) {
-    mid = json['mid'];
-    title = json['title'];
-    name = json['name'];
-    face = json['face'];
-    vip = Vip.fromJson(json['vip']);
-  }
-}
-
-class Vip {
-  Vip({
-    this.type,
-    this.status,
-  });
-
-  int? type;
-  int? status;
-
-  Vip.fromJson(Map<String, dynamic> json) {
-    type = json['type'];
-    status = json['status'];
   }
 }

lib/pages/about/index.dart

@@ -7,7 +7,6 @@ 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});
@@ -18,19 +17,6 @@ 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) {
@@ -53,54 +39,29 @@ class _AboutPageState extends State<AboutPage> {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             const SizedBox(height: 6),
+            Text(
+              '使用Flutter开发的哔哩哔哩第三方客户端',
+              style: TextStyle(color: Theme.of(context).colorScheme.outline),
+            ),
+            const SizedBox(height: 20),
             Obx(
-              () => Badge(
+              () => ListTile(
-                isLabelVisible: _aboutController.isLoading.value
+                title: const Text('当前版本'),
-                    ? false
+                trailing: Text(_aboutController.currentVersion.value,
-                    : _aboutController.isUpdate.value,
+                    style: subTitleStyle),
-                label: const Text('New'),
-                child: Padding(
-                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
-                  child: FilledButton.tonal(
-                    onPressed: () {
-                      showModalBottomSheet(
-                        context: context,
-                        builder: (context) {
-                          return Column(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              ListTile(
-                                onTap: () => _aboutController.githubRelease(),
-                                title: const Text('Github下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.panDownload(),
-                                title: const Text('网盘下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.webSiteUrl(),
-                                title: const Text('官网下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.qimiao(),
-                                title: const Text('奇妙应用'),
-                              ),
-                              SizedBox(
-                                  height:
-                                      MediaQuery.of(context).padding.bottom +
-                                          20)
-                            ],
-                          );
-                        },
-                      );
-                    },
-                    child: Text(
-                      'V${_aboutController.currentVersion.value}',
-                      style: subTitleStyle.copyWith(
-                        color: Theme.of(context).primaryColor,
-                      ),
               ),
             ),
+            Obx(
+              () => ListTile(
+                onTap: () => _aboutController.onUpdate(),
+                title: const Text('最新版本'),
+                trailing: Text(
+                  _aboutController.isLoading.value
+                      ? '正在获取'
+                      : _aboutController.isUpdate.value
+                          ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
+                          : '当前已是最新版',
+                  style: subTitleStyle,
                 ),
               ),
             ),
@@ -112,9 +73,14 @@ class _AboutPageState extends State<AboutPage> {
             //     size: 16,
             //   ),
             // ),
+            Divider(
+              thickness: 1,
+              height: 30,
+              color: Theme.of(context).colorScheme.outlineVariant,
+            ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
-              title: const Text('开源地址'),
+              title: const Text('Github'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -148,44 +114,20 @@ class _AboutPageState extends State<AboutPage> {
                 color: outline,
               ),
             ),
-            ListTile(
-              onTap: () {
-                showModalBottomSheet(
-                  context: context,
-                  builder: (context) {
-                    return Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
             ListTile(
               onTap: () => _aboutController.qqChanel(),
               title: const Text('QQ群'),
-                          trailing: Text(
-                            '616150809',
-                            style: subTitleStyle,
-                          ),
-                        ),
-                        ListTile(
-                          onTap: () => _aboutController.tgChanel(),
-                          title: const Text('TG频道'),
-                          trailing: Text(
-                            'https://t.me/+lm_oOVmF0RJiODk1',
-                            style: subTitleStyle,
-                          ),
-                        ),
-                        SizedBox(
-                            height: MediaQuery.of(context).padding.bottom + 20)
-                      ],
-                    );
-                  },
-                );
-              },
-              title: const Text('交流社区'),
               trailing: Icon(
                 Icons.arrow_forward_ios,
                 size: 16,
                 color: outline,
               ),
             ),
+            ListTile(
+              onTap: () => _aboutController.tgChanel(),
+              title: const Text('TG频道'),
+              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            ),
             ListTile(
               onTap: () => _aboutController.aPay(),
               title: const Text('赞助'),
@@ -196,17 +138,6 @@ class _AboutPageState extends State<AboutPage> {
               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),
-            ),
-            SizedBox(height: MediaQuery.of(context).padding.bottom + 20)
           ],
         ),
       ),
@@ -218,7 +149,7 @@ class AboutController extends GetxController {
   RxString currentVersion = ''.obs;
   RxString remoteVersion = ''.obs;
   late LatestDataModel remoteAppInfo;
-  RxBool isUpdate = false.obs;
+  RxBool isUpdate = true.obs;
   RxBool isLoading = true.obs;
   late LatestDataModel data;
 
@@ -253,16 +184,12 @@ class AboutController extends GetxController {
   // 获取远程版本
   Future getRemoteApp() async {
     var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
-    isLoading.value = false;
-    if (result.data == null || result.data.isEmpty) {
-      SmartDialog.showToast('获取远程版本失败，请检查网络');
-      return;
-    }
     data = LatestDataModel.fromJson(result.data);
     remoteAppInfo = data;
     remoteVersion.value = data.tagName!;
     isUpdate.value =
         Utils.needUpdate(currentVersion.value, remoteVersion.value);
+    isLoading.value = false;
   }
 
   // 跳转下载/本地更新
@@ -278,26 +205,11 @@ class AboutController extends GetxController {
     );
   }
 
-  githubRelease() {
-    launchUrl(
-      Uri.parse('https://github.com/guozhigq/pilipala/releases'),
-      mode: LaunchMode.externalApplication,
-    );
-  }
-
   // 从网盘下载
   panDownload() {
-    Clipboard.setData(
+    launchUrl(
-      const ClipboardData(text: 'pili'),
-    );
-    SmartDialog.showToast(
-      '已复制提取码：pili',
-      displayTime: const Duration(milliseconds: 500),
-    ).then(
-      (value) => launchUrl(
       Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
       mode: LaunchMode.externalApplication,
-      ),
     );
   }
 
@@ -313,7 +225,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '616150809'),
+      const ClipboardData(text: '489981949'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -354,13 +266,6 @@ class AboutController extends GetxController {
     );
   }
 
-  qimiao() {
-    launchUrl(
-      Uri.parse('https://www.magicalapk.com/home'),
-      mode: LaunchMode.externalApplication,
-    );
-  }
-
   // 日志
   logs() {
     Get.toNamed('/logs');

lib/pages/bangumi/controller.dart

@@ -7,8 +7,8 @@ import 'package:pilipala/utils/storage.dart';
 
 class BangumiController extends GetxController {
   final ScrollController scrollController = ScrollController();
-  RxList<BangumiListItemModel> bangumiList = <BangumiListItemModel>[].obs;
+  RxList<BangumiListItemModel> bangumiList = [BangumiListItemModel()].obs;
-  RxList<BangumiListItemModel> bangumiFollowList = <BangumiListItemModel>[].obs;
+  RxList<BangumiListItemModel> bangumiFollowList = [BangumiListItemModel()].obs;
   int _currentPage = 1;
   bool isLoadingMore = true;
   Box userInfoCache = GStrorage.userInfo;

lib/pages/bangumi/introduction/controller.dart

@@ -15,10 +15,6 @@ import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
 
-import '../../../common/pages_bottom_sheet.dart';
-import '../../../models/common/video_episode_type.dart';
-import '../../../utils/drawer.dart';
-
 class BangumiIntroController extends GetxController {
   // 视频bvid
   String bvid = Get.parameters['bvid']!;
@@ -29,6 +25,13 @@ class BangumiIntroController extends GetxController {
       ? int.tryParse(Get.parameters['epId']!)
       : null;
 
+  // 是否预渲染 骨架屏
+  bool preRender = false;
+
+  // 视频详情 上个页面传入
+  Map? videoItem = {};
+  BangumiInfoModel? bangumiItem;
+
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -56,11 +59,31 @@ class BangumiIntroController extends GetxController {
   RxMap followStatus = {}.obs;
   int _tempThemeValue = -1;
   var userInfo;
-  PersistentBottomSheetController? bottomSheetController;
 
   @override
   void onInit() {
     super.onInit();
+    if (Get.arguments.isNotEmpty as bool) {
+      if (Get.arguments.containsKey('bangumiItem') as bool) {
+        preRender = true;
+        bangumiItem = Get.arguments['bangumiItem'];
+        // bangumiItem!['pic'] = args.pic;
+        // if (args.title is String) {
+        //   videoItem!['title'] = args.title;
+        // } else {
+        //   String str = '';
+        //   for (Map map in args.title) {
+        //     str += map['text'];
+        //   }
+        //   videoItem!['title'] = str;
+        // }
+        // if (args.stat != null) {
+        //   videoItem!['stat'] = args.stat;
+        // }
+        // videoItem!['pubdate'] = args.pubdate;
+        // videoItem!['owner'] = args.owner;
+      }
+    }
     userInfo = userInfoCache.get('userInfoCache');
     userLogin = userInfo != null;
   }
@@ -131,37 +154,50 @@ class BangumiIntroController extends GetxController {
         builder: (context) {
           return AlertDialog(
             title: const Text('选择投币个数'),
-            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
+            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
             content: StatefulBuilder(builder: (context, StateSetter setState) {
               return Column(
                 mainAxisSize: MainAxisSize.min,
-                children: [1, 2]
+                children: [
-                    .map(
+                  RadioListTile(
-                      (e) => RadioListTile(
+                    value: 1,
-                        value: e,
+                    title: const Text('1枚'),
-                        title: Text('$e枚'),
                     groupValue: _tempThemeValue,
-                        onChanged: (value) async {
+                    onChanged: (value) {
                       _tempThemeValue = value!;
-                          setState(() {});
+                      Get.appUpdate();
+                    },
+                  ),
+                  RadioListTile(
+                    value: 2,
+                    title: const Text('2枚'),
+                    groupValue: _tempThemeValue,
+                    onChanged: (value) {
+                      _tempThemeValue = value!;
+                      Get.appUpdate();
+                    },
+                  ),
+                ],
+              );
+            }),
+            actions: [
+              TextButton(onPressed: () => Get.back(), child: const Text('取消')),
+              TextButton(
+                  onPressed: () async {
                     var res = await VideoHttp.coinVideo(
                         bvid: bvid, multiply: _tempThemeValue);
                     if (res['status']) {
                       SmartDialog.showToast('投币成功 👏');
                       hasCoin.value = true;
                       bangumiDetail.value.stat!['coins'] =
-                                bangumiDetail.value.stat!['coins'] +
+                          bangumiDetail.value.stat!['coins'] + _tempThemeValue;
-                                    _tempThemeValue;
                     } else {
                       SmartDialog.showToast(res['msg']);
                     }
                     Get.back();
                   },
-                      ),
+                  child: const Text('确定'))
-                    )
+            ],
-                    .toList(),
-              );
-            }),
           );
         });
   }
@@ -182,12 +218,14 @@ class BangumiIntroController extends GetxController {
         addIds: addMediaIdsNew.join(','),
         delIds: delMediaIdsNew.join(','));
     if (result['status']) {
+      if (result['data']['prompt']) {
         addMediaIdsNew = [];
         delMediaIdsNew = [];
+        Get.back();
         // 重新获取收藏状态
         queryHasFavVideo();
         SmartDialog.showToast('✅ 操作成功');
-      Get.back();
+      }
     }
   }
 
@@ -215,18 +253,14 @@ class BangumiIntroController extends GetxController {
   }
 
   // 修改分P或番剧分集
-  Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
+  Future changeSeasonOrbangu(bvid, cid, aid) async {
     // 重新获取视频资源
     VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
     videoDetailCtr.bvid = bvid;
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
-    videoDetailCtr.oid.value = aid;
-    videoDetailCtr.cover.value = cover;
     videoDetailCtr.queryVideoUrl();
-    videoDetailCtr.getSubtitle();
-    videoDetailCtr.setSubtitleContent();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
@@ -284,36 +318,6 @@ class BangumiIntroController extends GetxController {
     int cid = episodes[nextIndex].cid!;
     String bvid = episodes[nextIndex].bvid!;
     int aid = episodes[nextIndex].aid!;
-    String cover = episodes[nextIndex].cover!;
+    changeSeasonOrbangu(bvid, cid, aid);
-    changeSeasonOrbangu(bvid, cid, aid, cover);
-  }
-
-  // 播放器底栏 选集 回调
-  void showEposideHandler() {
-    late List episodes = bangumiDetail.value.episodes!;
-    VideoEpidoesType dataType = VideoEpidoesType.bangumiEpisode;
-    if (episodes.isEmpty) {
-      return;
-    }
-    VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
-    DrawerUtils.showRightDialog(
-      child: EpisodeBottomSheet(
-        episodes: episodes,
-        currentCid: videoDetailCtr.cid.value,
-        dataType: dataType,
-        context: Get.context!,
-        sheetHeight: Get.size.height,
-        isFullScreen: true,
-        changeFucCall: (item, index) {
-          changeSeasonOrbangu(item.bvid, item.cid, item.aid, item.cover);
-          SmartDialog.dismiss();
-        },
-      ).buildShowContent(Get.context!),
-    );
-  }
-
-  hiddenEpisodeBottomSheet() {
-    bottomSheetController?.close();
   }
 }

lib/pages/bangumi/introduction/view.dart

@@ -12,10 +12,11 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/bangumi/widgets/bangumi_panel.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/action_item.dart';
+import 'package:pilipala/pages/video/detail/introduction/widgets/action_row_item.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/fav_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
-import '../../../common/widgets/http_error.dart';
+
 import 'controller.dart';
 import 'widgets/intro_detail.dart';
 
@@ -50,6 +51,9 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     cid = widget.cid!;
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
+      bangumiDetail = value;
+    });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
     videoDetailCtr.cid.listen((int p0) {
       cid = p0;
@@ -64,32 +68,27 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
-          if (snapshot.data == null) {
-            return const SliverToBoxAdapter(child: SizedBox());
-          }
           if (snapshot.data['status']) {
             // 请求成功
-            return Obx(
+
-              () => BangumiInfo(
+            return BangumiInfo(
-                bangumiDetail: bangumiIntroController.bangumiDetail.value,
+              loadingStatus: false,
+              bangumiDetail: bangumiDetail,
               cid: cid,
-              ),
             );
           } else {
             // 请求错误
-            return HttpError(
+            // return HttpError(
-              errMsg: snapshot.data['msg'],
+            //   errMsg: snapshot.data['msg'],
-              fn: () => Get.back(),
+            //   fn: () => Get.back(),
-            );
+            // );
+            return const SizedBox();
           }
         } else {
-          return const SliverToBoxAdapter(
+          return BangumiInfo(
-            child: SizedBox(
+            loadingStatus: true,
-              height: 100,
+            bangumiDetail: bangumiDetail,
-              child: Center(
+            cid: cid,
-                child: CircularProgressIndicator(),
-              ),
-            ),
           );
         }
       },
@@ -100,10 +99,12 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 class BangumiInfo extends StatefulWidget {
   const BangumiInfo({
     super.key,
+    this.loadingStatus = false,
     this.bangumiDetail,
     this.cid,
   });
 
+  final bool loadingStatus;
   final BangumiInfoModel? bangumiDetail;
   final int? cid;
 
@@ -116,6 +117,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiIntroController bangumiIntroController;
   late final VideoDetailController videoDetailCtr;
   Box localCache = GStrorage.localCache;
+  late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
   bool isProcessing = false;
@@ -134,13 +136,13 @@ class _BangumiInfoState extends State<BangumiInfo> {
     super.initState();
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
+    print('cid:  $cid');
     videoDetailCtr.cid.listen((p0) {
       cid = p0;
-      if (!mounted) {
+      print('cid:  $cid');
-        return;
-      }
       setState(() {});
     });
   }
@@ -180,7 +182,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
       sliver: SliverToBoxAdapter(
-          child: Column(
+        child: !widget.loadingStatus || bangumiItem != null
+            ? Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Row(
@@ -191,11 +194,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                           NetworkImgLayer(
                             width: 105,
                             height: 160,
-                    src: widget.bangumiDetail!.cover!,
+                            src: !widget.loadingStatus
+                                ? widget.bangumiDetail!.cover!
+                                : bangumiItem!.cover!,
                           ),
+                          if (bangumiItem != null &&
+                              bangumiItem!.rating != null)
                             PBadge(
                               text:
-                        '评分 ${widget.bangumiDetail?.rating?['score']! ?? '暂无'}',
+                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
                               top: null,
                               right: 6,
                               bottom: 6,
@@ -217,7 +224,9 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     Expanded(
                                       child: Text(
-                                widget.bangumiDetail!.title!,
+                                        !widget.loadingStatus
+                                            ? widget.bangumiDetail!.title!
+                                            : bangumiItem!.title!,
                                         style: const TextStyle(
                                           fontSize: 16,
                                           fontWeight: FontWeight.w500,
@@ -237,7 +246,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                           backgroundColor:
                                               MaterialStateProperty.resolveWith(
                                                   (Set<MaterialState> states) {
-                                    return t.colorScheme.primaryContainer
+                                            return t
+                                                .colorScheme.primaryContainer
                                                 .withOpacity(0.7);
                                           }),
                                         ),
@@ -256,13 +266,18 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     StatView(
                                       theme: 'gray',
-                              view: widget.bangumiDetail!.stat!['views'],
+                                      view: !widget.loadingStatus
+                                          ? widget.bangumiDetail!.stat!['views']
+                                          : bangumiItem!.stat!['views'],
                                       size: 'medium',
                                     ),
                                     const SizedBox(width: 6),
                                     StatDanMu(
                                       theme: 'gray',
-                              danmu: widget.bangumiDetail!.stat!['danmakus'],
+                                      danmu: !widget.loadingStatus
+                                          ? widget
+                                              .bangumiDetail!.stat!['danmakus']
+                                          : bangumiItem!.stat!['danmakus'],
                                       size: 'medium',
                                     ),
                                   ],
@@ -271,8 +286,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                 Row(
                                   children: [
                                     Text(
-                              (widget.bangumiDetail!.areas!.isNotEmpty
+                                      !widget.loadingStatus
-                                  ? widget.bangumiDetail!.areas!.first['name']
+                                          ? (widget.bangumiDetail!.areas!
+                                                  .isNotEmpty
+                                              ? widget.bangumiDetail!.areas!
+                                                  .first['name']
+                                              : '')
+                                          : (bangumiItem!.areas!.isNotEmpty
+                                              ? bangumiItem!
+                                                  .areas!.first['name']
                                               : ''),
                                       style: TextStyle(
                                         fontSize: 12,
@@ -281,7 +303,11 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                     ),
                                     const SizedBox(width: 6),
                                     Text(
-                              widget.bangumiDetail!.publish!['pub_time_show'],
+                                      !widget.loadingStatus
+                                          ? widget.bangumiDetail!
+                                              .publish!['pub_time_show']
+                                          : bangumiItem!
+                                              .publish!['pub_time_show'],
                                       style: TextStyle(
                                         fontSize: 12,
                                         color: t.colorScheme.outline,
@@ -289,16 +315,20 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                     ),
                                   ],
                                 ),
+                                // const SizedBox(height: 4),
                                 Text(
-                          widget.bangumiDetail!.newEp!['desc'],
+                                  !widget.loadingStatus
+                                      ? widget.bangumiDetail!.newEp!['desc']
+                                      : bangumiItem!.newEp!['desc'],
                                   style: TextStyle(
                                     fontSize: 12,
                                     color: t.colorScheme.outline,
                                   ),
                                 ),
+                                // const SizedBox(height: 10),
                                 const Spacer(),
                                 Text(
-                          '简介：${widget.bangumiDetail!.evaluate!}',
+                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
                                   maxLines: 3,
                                   overflow: TextOverflow.ellipsis,
                                   style: TextStyle(
@@ -314,23 +344,45 @@ class _BangumiInfoState extends State<BangumiInfo> {
                     ],
                   ),
                   const SizedBox(height: 6),
-
+                  // 点赞收藏转发 布局样式1
-          /// 点赞收藏转发
+                  // SingleChildScrollView(
+                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
+                  //   scrollDirection: Axis.horizontal,
+                  //   child: actionRow(
+                  //     context,
+                  //     bangumiIntroController,
+                  //     videoDetailCtr,
+                  //   ),
+                  // ),
+                  // 点赞收藏转发 布局样式2
                   actionGrid(context, bangumiIntroController),
                   // 番剧分p
-          if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[
+                  if ((!widget.loadingStatus &&
+                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
+                      bangumiItem != null &&
+                          bangumiItem!.episodes!.isNotEmpty) ...[
                     BangumiPanel(
-              pages: widget.bangumiDetail!.episodes!,
+                      pages: bangumiItem != null
-              cid: cid! ?? widget.bangumiDetail!.episodes!.first.cid!,
+                          ? bangumiItem!.episodes!
+                          : widget.bangumiDetail!.episodes!,
+                      cid: cid ??
+                          (bangumiItem != null
+                              ? bangumiItem!.episodes!.first.cid
+                              : widget.bangumiDetail!.episodes!.first.cid),
                       sheetHeight: sheetHeight,
-              changeFuc: (bvid, cid, aid, cover) => bangumiIntroController
+                      changeFuc: (bvid, cid, aid) => bangumiIntroController
-                  .changeSeasonOrbangu(bvid, cid, aid, cover),
+                          .changeSeasonOrbangu(bvid, cid, aid),
-              bangumiDetail: bangumiIntroController.bangumiDetail.value,
-              bangumiIntroController: bangumiIntroController,
                     )
                   ],
                 ],
-      )),
+              )
+            : const SizedBox(
+                height: 100,
+                child: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              ),
+      ),
     );
   }
 
@@ -352,19 +404,25 @@ 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,
-                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
+                      loadingStatus: false,
-                  ),
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['likes']!.toString()
+                          : bangumiItem!.stat!['likes']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.b),
                       selectIcon: const Icon(FontAwesomeIcons.b),
-                    onTap: handleState(bangumiIntroController.actionCoinVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
-                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
+                      loadingStatus: false,
-                  ),
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['coins']!.toString()
+                          : bangumiItem!.stat!['coins']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
@@ -372,22 +430,29 @@ class _BangumiInfoState extends State<BangumiInfo> {
                       selectIcon: const Icon(FontAwesomeIcons.solidStar),
                       onTap: () => showFavBottomSheet(),
                       selectStatus: bangumiIntroController.hasFav.value,
-                    text: widget.bangumiDetail!.stat!['favorite']!.toString(),
+                      loadingStatus: false,
-                  ),
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['favorite']!.toString()
+                          : bangumiItem!.stat!['favorite']!.toString()),
                 ),
                 ActionItem(
                   icon: const Icon(FontAwesomeIcons.comment),
                   selectIcon: const Icon(FontAwesomeIcons.reply),
                   onTap: () => videoDetailCtr.tabCtr.animateTo(1),
                   selectStatus: false,
-                  text: widget.bangumiDetail!.stat!['reply']!.toString(),
+                  loadingStatus: false,
+                  text: !widget.loadingStatus
+                      ? widget.bangumiDetail!.stat!['reply']!.toString()
+                      : bangumiItem!.stat!['reply']!.toString(),
                 ),
                 ActionItem(
                     icon: const Icon(FontAwesomeIcons.shareFromSquare),
                     onTap: () => bangumiIntroController.actionShareVideo(),
                     selectStatus: false,
-                  text: widget.bangumiDetail!.stat!['share']!.toString(),
+                    loadingStatus: false,
-                ),
+                    text: !widget.loadingStatus
+                        ? widget.bangumiDetail!.stat!['share']!.toString()
+                        : bangumiItem!.stat!['share']!.toString()),
               ],
             ),
           ),
@@ -395,4 +460,63 @@ class _BangumiInfoState extends State<BangumiInfo> {
       );
     });
   }
+
+  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
+    return Row(children: [
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.thumbsUp),
+          onTap: handleState(videoIntroController.actionLikeVideo),
+          selectStatus: videoIntroController.hasLike.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['likes']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.b),
+          onTap: handleState(videoIntroController.actionCoinVideo),
+          selectStatus: videoIntroController.hasCoin.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['coins']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.heart),
+          onTap: () => showFavBottomSheet(),
+          selectStatus: videoIntroController.hasFav.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['favorite']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+        icon: const Icon(FontAwesomeIcons.comment),
+        onTap: () {
+          videoDetailCtr.tabCtr.animateTo(1);
+        },
+        selectStatus: false,
+        loadingStatus: widget.loadingStatus,
+        text: !widget.loadingStatus
+            ? widget.bangumiDetail!.stat!['reply']!.toString()
+            : '-',
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.share),
+          onTap: () => videoIntroController.actionShareVideo(),
+          selectStatus: false,
+          loadingStatus: widget.loadingStatus,
+          text: '转发'),
+    ]);
+  }
 }

lib/pages/bangumi/introduction/widgets/intro_detail.dart

@@ -20,10 +20,10 @@ class IntroDetail extends StatelessWidget {
     sheetHeight = localCache.get('sheetHeight');
     TextStyle smallTitle = TextStyle(
       fontSize: 12,
-      color: Theme.of(context).colorScheme.onSurface,
+      color: Theme.of(context).colorScheme.onBackground,
     );
     return Container(
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       padding: const EdgeInsets.only(left: 14, right: 14),
       height: sheetHeight,
       child: Column(

lib/pages/bangumi/view.dart

@@ -2,10 +2,14 @@ import 'dart:async';
 
 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/utils/main_stream.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';
@@ -31,6 +35,10 @@ class _BangumiPageState extends State<BangumiPage>
   void initState() {
     super.initState();
     scrollController = _bangumidController.scrollController;
+    StreamController<bool> mainStream =
+        Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
     _futureBuilderFuture = _bangumidController.queryBangumiListFeed();
     _futureBuilderFutureFollow = _bangumidController.queryBangumiFollow();
     scrollController.addListener(
@@ -42,7 +50,16 @@ class _BangumiPageState extends State<BangumiPage>
             _bangumidController.onLoad();
           });
         }
-        handleScrollEvent(scrollController);
+
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          mainStream.add(true);
+          searchBarStream.add(true);
+        } else if (direction == ScrollDirection.reverse) {
+          mainStream.add(false);
+          searchBarStream.add(false);
+        }
       },
     );
   }
@@ -141,10 +158,10 @@ class _BangumiPageState extends State<BangumiPage>
                                       ),
                               );
                             } else {
-                              return const SizedBox();
+                              return nil;
                             }
                           } else {
-                            return const SizedBox();
+                            return nil;
                           }
                         },
                       ),
@@ -182,10 +199,7 @@ class _BangumiPageState extends State<BangumiPage>
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () {
+                      fn: () => {},
-                        _futureBuilderFuture =
-                            _bangumidController.queryBangumiListFeed();
-                      },
                     );
                   }
                 } else {
@@ -194,6 +208,7 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
+          const LoadingMore()
         ],
       ),
     );
@@ -215,7 +230,7 @@ class _BangumiPageState extends State<BangumiPage>
         (BuildContext context, int index) {
           return bangumiList!.isNotEmpty
               ? BangumiCardV(bangumiItem: bangumiList[index])
-              : const SizedBox();
+              : nil;
         },
         childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10,
       ),

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -8,35 +6,29 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-import '../../../common/pages_bottom_sheet.dart';
-import '../../../models/common/video_episode_type.dart';
-import '../introduction/controller.dart';
 
 class BangumiPanel extends StatefulWidget {
   const BangumiPanel({
     super.key,
     required this.pages,
-    required this.cid,
+    this.cid,
     this.sheetHeight,
     this.changeFuc,
-    this.bangumiDetail,
-    this.bangumiIntroController,
   });
 
   final List<EpisodeItem> pages;
-  final int cid;
+  final int? cid;
   final double? sheetHeight;
   final Function? changeFuc;
-  final BangumiInfoModel? bangumiDetail;
-  final BangumiIntroController? bangumiIntroController;
 
   @override
   State<BangumiPanel> createState() => _BangumiPanelState();
 }
 
 class _BangumiPanelState extends State<BangumiPanel> {
-  late RxInt currentIndex = (-1).obs;
+  late int currentIndex;
   final ScrollController listViewScrollCtr = ScrollController();
+  final ScrollController listViewScrollCtr_2 = ScrollController();
   Box userInfoCache = GStrorage.userInfo;
   dynamic userInfo;
   // 默认未开通
@@ -45,87 +37,155 @@ class _BangumiPanelState extends State<BangumiPanel> {
   String heroTag = Get.arguments['heroTag'];
   late final VideoDetailController videoDetailCtr;
   final ItemScrollController itemScrollController = ItemScrollController();
-  late PersistentBottomSheetController? _bottomSheetController;
 
   @override
   void initState() {
     super.initState();
-    cid = widget.cid;
+    cid = widget.cid!;
-    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
-    currentIndex.value =
-        widget.pages.indexWhere((EpisodeItem e) => e.cid == cid);
     scrollToIndex();
-    videoDetailCtr.cid.listen((int p0) {
-      cid = p0;
-      currentIndex.value =
-          widget.pages.indexWhere((EpisodeItem e) => e.cid == cid);
-      scrollToIndex();
-    });
-
-    /// 获取大会员状态
     userInfo = userInfoCache.get('userInfoCache');
     if (userInfo != null) {
       vipStatus = userInfo.vipStatus;
     }
+    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+
+    videoDetailCtr.cid.listen((int p0) {
+      cid = p0;
+      setState(() {});
+      currentIndex = widget.pages.indexWhere((EpisodeItem e) => e.cid == cid);
+      scrollToIndex();
+    });
   }
 
   @override
   void dispose() {
     listViewScrollCtr.dispose();
+    listViewScrollCtr_2.dispose();
     super.dispose();
   }
 
+  void showBangumiPanel() {
+    showBottomSheet(
+      context: context,
+      builder: (BuildContext context) {
+        return StatefulBuilder(
+          builder: (BuildContext context, StateSetter setState) {
+            WidgetsBinding.instance.addPostFrameCallback((_) async {
+              // await Future.delayed(const Duration(milliseconds: 200));
+              // listViewScrollCtr_2.animateTo(currentIndex * 56,
+              //     duration: const Duration(milliseconds: 500),
+              //     curve: Curves.easeInOut);
+              itemScrollController.jumpTo(index: currentIndex);
+            });
+            // 在这里使用 setState 更新状态
+            return Container(
+              height: widget.sheetHeight,
+              color: Theme.of(context).colorScheme.background,
+              child: Column(
+                children: [
+                  AppBar(
+                    toolbarHeight: 45,
+                    automaticallyImplyLeading: false,
+                    title: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text(
+                          '合集（${widget.pages.length}）',
+                          style: Theme.of(context).textTheme.titleMedium,
+                        ),
+                        IconButton(
+                          icon: const Icon(Icons.close),
+                          onPressed: () => Navigator.pop(context),
+                        ),
+                      ],
+                    ),
+                    titleSpacing: 10,
+                  ),
+                  Expanded(
+                    child: Material(
+                      child: ScrollablePositionedList.builder(
+                        itemCount: widget.pages.length,
+                        itemBuilder: (BuildContext context, int index) =>
+                            ListTile(
+                          onTap: () {
+                            setState(() {
+                              changeFucCall(widget.pages[index], index);
+                            });
+                          },
+                          dense: false,
+                          leading: index == currentIndex
+                              ? Image.asset(
+                                  'assets/images/live.gif',
+                                  color: Theme.of(context).colorScheme.primary,
+                                  height: 12,
+                                )
+                              : null,
+                          title: Text(
+                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: index == currentIndex
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                          trailing: widget.pages[index].badge != null
+                              ? Image.asset(
+                                  'assets/images/big-vip.png',
+                                  height: 20,
+                                )
+                              : const SizedBox(),
+                        ),
+                        itemScrollController: itemScrollController,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
   void changeFucCall(item, i) async {
-    if (item.badge != null && item.badge == '会员' && vipStatus != 1) {
+    if (item.badge != null && vipStatus != 1) {
       SmartDialog.showToast('需要大会员');
       return;
     }
-    widget.changeFuc?.call(
+    await widget.changeFuc!(
       item.bvid,
       item.cid,
       item.aid,
-      item.cover,
     );
-    if (_bottomSheetController != null) {
+    currentIndex = i;
-      _bottomSheetController?.close();
+    setState(() {});
-    }
-    currentIndex.value = i;
     scrollToIndex();
   }
 
   void scrollToIndex() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       // 在回调函数中获取更新后的状态
-      final double offset = min((currentIndex * 150) - 75,
+      listViewScrollCtr.animateTo(currentIndex * 150,
-          listViewScrollCtr.position.maxScrollExtent);
+          duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
-      if (currentIndex.value == 0) {
-        listViewScrollCtr.jumpTo(0);
-      } else {
-        listViewScrollCtr.animateTo(
-          offset,
-          duration: const Duration(milliseconds: 300),
-          curve: Curves.easeInOut,
-        );
-      }
     });
   }
 
   @override
   Widget build(BuildContext context) {
-    Color primary = Theme.of(context).colorScheme.primary;
-    Color onSurface = Theme.of(context).colorScheme.onSurface;
     return Column(
       children: [
         Padding(
-          padding: const EdgeInsets.only(top: 10, bottom: 10),
+          padding: const EdgeInsets.only(top: 10, bottom: 6),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              const Text('选集 '),
+              const Text('合集 '),
               Expanded(
-                child: Obx(
+                child: Text(
-                  () => Text(
+                  ' 正在播放：${widget.pages[currentIndex].longTitle}',
-                    ' 正在播放：${widget.pages[currentIndex.value].longTitle}',
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(
                     fontSize: 12,
@@ -133,7 +193,6 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   ),
                 ),
               ),
-              ),
               const SizedBox(width: 10),
               SizedBox(
                 height: 34,
@@ -141,19 +200,9 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   style: ButtonStyle(
                     padding: MaterialStateProperty.all(EdgeInsets.zero),
                   ),
-                  onPressed: () {
+                  onPressed: () => showBangumiPanel(),
-                    widget.bangumiIntroController?.bottomSheetController =
-                        _bottomSheetController = EpisodeBottomSheet(
-                      currentCid: cid,
-                      episodes: widget.pages,
-                      changeFucCall: changeFucCall,
-                      sheetHeight: widget.sheetHeight,
-                      dataType: VideoEpidoesType.bangumiEpisode,
-                      context: context,
-                    ).show(context);
-                  },
                   child: Text(
-                    '${widget.bangumiDetail!.newEp!['desc']}',
+                    '全${widget.pages.length}话',
                     style: const TextStyle(fontSize: 13),
                   ),
                 ),
@@ -169,8 +218,6 @@ class _BangumiPanelState extends State<BangumiPanel> {
             itemCount: widget.pages.length,
             itemExtent: 150,
             itemBuilder: (BuildContext context, int i) {
-              var page = widget.pages[i];
-              bool isSelected = i == currentIndex.value;
               return Container(
                 width: 150,
                 margin: const EdgeInsets.only(right: 10),
@@ -179,50 +226,51 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   borderRadius: BorderRadius.circular(6),
                   clipBehavior: Clip.hardEdge,
                   child: InkWell(
-                    onTap: () => changeFucCall(page, i),
+                    onTap: () => changeFucCall(widget.pages[i], i),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
-                        vertical: 8,
+                          vertical: 8, horizontal: 10),
-                        horizontal: 10,
-                      ),
                       child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: <Widget>[
                           Row(
                             children: [
-                              if (isSelected) ...<Widget>[
+                              if (i == currentIndex) ...<Widget>[
-                                Image.asset('assets/images/live.png',
+                                Image.asset(
-                                    color: primary, height: 12),
+                                  'assets/images/live.png',
+                                  color: Theme.of(context).colorScheme.primary,
+                                  height: 12,
+                                ),
                                 const SizedBox(width: 6)
                               ],
                               Text(
                                 '第${i + 1}话',
                                 style: TextStyle(
                                     fontSize: 13,
-                                  color: isSelected ? primary : onSurface,
+                                    color: i == currentIndex
-                                ),
+                                        ? Theme.of(context).colorScheme.primary
+                                        : Theme.of(context)
+                                            .colorScheme
+                                            .onSurface),
                               ),
                               const SizedBox(width: 2),
-                              if (page.badge != null) ...[
+                              if (widget.pages[i].badge != null) ...[
-                                const Spacer(),
+                                Image.asset(
-                                Text(
+                                  'assets/images/big-vip.png',
-                                  page.badge!,
+                                  height: 16,
-                                  style: TextStyle(
-                                    fontSize: 12,
-                                    color: primary,
                                 ),
-                                ),
+                              ],
-                              ]
                             ],
                           ),
                           const SizedBox(height: 3),
                           Text(
-                            page.longTitle!,
+                            widget.pages[i].longTitle!,
                             maxLines: 1,
                             style: TextStyle(
                                 fontSize: 13,
-                              color: isSelected ? primary : onSurface,
+                                color: i == currentIndex
-                            ),
+                                    ? Theme.of(context).colorScheme.primary
+                                    : Theme.of(context).colorScheme.onSurface),
                             overflow: TextOverflow.ellipsis,
                           )
                         ],

lib/pages/bangumi/widgets/bangumu_card_v.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/models/bangumi/list.dart';
+import 'package:pilipala/http/search.dart';
-import 'package:pilipala/utils/image_save.dart';
+import 'package:pilipala/models/bangumi/info.dart';
-import 'package:pilipala/utils/route_push.dart';
+import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 
@@ -13,28 +14,68 @@ class BangumiCardV extends StatelessWidget {
   const BangumiCardV({
     super.key,
     required this.bangumiItem,
+    this.longPress,
+    this.longPressEnd,
   });
 
-  final BangumiListItemModel bangumiItem;
+  final bangumiItem;
+  final Function()? longPress;
+  final Function()? longPressEnd;
 
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(bangumiItem.mediaId);
-    return InkWell(
+    return Card(
-      onTap: () {
+      elevation: 0,
-        RoutePush.bangumiPush(
+      clipBehavior: Clip.hardEdge,
-          bangumiItem.seasonId,
+      margin: EdgeInsets.zero,
-          null,
+      child: GestureDetector(
-          heroTag: heroTag,
+        // onLongPress: () {
-        );
+        //   if (longPress != null) {
+        //     longPress!();
+        //   }
+        // },
+        // onLongPressEnd: (details) {
+        //   if (longPressEnd != null) {
+        //     longPressEnd!();
+        //   }
+        // },
+        child: InkWell(
+          onTap: () async {
+            final int seasonId = bangumiItem.seasonId;
+            SmartDialog.showLoading(msg: '获取中...');
+            final res = await SearchHttp.bangumiInfo(seasonId: seasonId);
+            SmartDialog.dismiss().then((value) {
+              if (res['status']) {
+                if (res['data'].episodes.isEmpty) {
+                  SmartDialog.showToast('资源加载失败');
+                  return;
+                }
+                EpisodeItem episode = res['data'].episodes.first;
+                String bvid = episode.bvid!;
+                int cid = episode.cid!;
+                String pic = episode.cover!;
+                String heroTag = Utils.makeHeroTag(cid);
+                Get.toNamed(
+                  '/video?bvid=$bvid&cid=$cid&seasonId=$seasonId',
+                  arguments: {
+                    'pic': pic,
+                    'heroTag': heroTag,
+                    'videoType': SearchType.media_bangumi,
+                    'bangumiItem': res['data'],
+                  },
+                );
+              }
+            });
           },
-      onLongPress: () =>
-          imageSaveDialog(context, bangumiItem, SmartDialog.dismiss),
           child: Column(
             children: [
               ClipRRect(
-            borderRadius: const BorderRadius.all(
+                borderRadius: const BorderRadius.only(
-              StyleString.imgRadius,
+                  topLeft: StyleString.imgRadius,
+                  topRight: StyleString.imgRadius,
+                  bottomLeft: StyleString.imgRadius,
+                  bottomRight: StyleString.imgRadius,
                 ),
                 child: AspectRatio(
                   aspectRatio: 0.65,
@@ -75,6 +116,8 @@ class BangumiCardV extends StatelessWidget {
               BangumiContent(bangumiItem: bangumiItem)
             ],
           ),
+        ),
+      ),
     );
   }
 }

lib/pages/blacklist/index.dart

@@ -139,7 +139,7 @@ class BlackListController extends GetxController {
   int currentPage = 1;
   int pageSize = 50;
   RxInt total = 0.obs;
-  RxList<BlackListItem> blackList = <BlackListItem>[].obs;
+  RxList<BlackListItem> blackList = [BlackListItem()].obs;
 
   Future queryBlacklist({type = 'init'}) async {
     if (type == 'init') {

lib/pages/dlna/index.dart

@@ -1,111 +0,0 @@
-import 'dart:async';
-
-import 'package:dlna_dart/dlna.dart';
-import 'package:flutter/material.dart';
-
-class LiveDlnaPage extends StatefulWidget {
-  final String datasource;
-
-  const LiveDlnaPage({Key? key, required this.datasource}) : super(key: key);
-
-  @override
-  State<LiveDlnaPage> createState() => _LiveDlnaPageState();
-}
-
-class _LiveDlnaPageState extends State<LiveDlnaPage> {
-  final Map<String, DLNADevice> _deviceList = {};
-  final DLNAManager searcher = DLNAManager();
-  late final Timer stopSearchTimer;
-  String selectDeviceKey = '';
-  bool isSearching = true;
-
-  DLNADevice? get device => _deviceList[selectDeviceKey];
-
-  @override
-  void initState() {
-    stopSearchTimer = Timer(const Duration(seconds: 20), () {
-      setState(() => isSearching = false);
-      searcher.stop();
-    });
-    searcher.stop();
-    startSearch();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    searcher.stop();
-    stopSearchTimer.cancel();
-  }
-
-  void startSearch() async {
-    // clear old devices
-    isSearching = true;
-    selectDeviceKey = '';
-    _deviceList.clear();
-    setState(() {});
-    // start search server
-    final m = await searcher.start();
-    m.devices.stream.listen((deviceList) {
-      deviceList.forEach((key, value) {
-        _deviceList[key] = value;
-      });
-      setState(() {});
-    });
-    // close the server, the closed server can be start by call searcher.start()
-  }
-
-  void selectDevice(String key) {
-    if (selectDeviceKey.isNotEmpty) device?.pause();
-
-    selectDeviceKey = key;
-    device?.setUrl(widget.datasource);
-    device?.play();
-    setState(() {});
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Widget cur;
-    if (isSearching && _deviceList.isEmpty) {
-      cur = const Center(child: CircularProgressIndicator());
-    } else if (_deviceList.isEmpty) {
-      cur = Center(
-        child: Text(
-          '没有找到设备',
-          style: Theme.of(context).textTheme.bodyLarge,
-        ),
-      );
-    } else {
-      cur = ListView(
-        children: _deviceList.keys
-            .map<Widget>((key) => ListTile(
-                  contentPadding: const EdgeInsets.all(2),
-                  title: Text(_deviceList[key]!.info.friendlyName),
-                  subtitle: Text(key),
-                  onTap: () => selectDevice(key),
-                ))
-            .toList(),
-      );
-    }
-
-    return AlertDialog(
-      title: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text('查找设备'),
-          IconButton(
-            onPressed: startSearch,
-            icon: const Icon(Icons.refresh_rounded),
-          ),
-        ],
-      ),
-      content: SizedBox(
-        height: 200,
-        width: 200,
-        child: cur,
-      ),
-    );
-  }
-}

lib/pages/dynamics/controller.dart

@@ -14,14 +14,13 @@ import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
-import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class DynamicsController extends GetxController {
   int page = 1;
   String? offset = '';
-  RxList<DynamicItemModel> dynamicsList = <DynamicItemModel>[].obs;
+  RxList<DynamicItemModel> dynamicsList = [DynamicItemModel()].obs;
   Rx<DynamicsType> dynamicsType = DynamicsType.values[0].obs;
   RxString dynamicsTypeLabel = '全部'.obs;
   final ScrollController scrollController = ScrollController();
@@ -71,7 +70,7 @@ class DynamicsController extends GetxController {
 
   Future queryFollowDynamic({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录', 'code': -101};
+      return {'status': false, 'msg': '账号未登录'};
     }
     if (type == 'init') {
       dynamicsList.clear();
@@ -106,7 +105,7 @@ class DynamicsController extends GetxController {
 
   onSelectType(value) async {
     dynamicsType.value = filterTypeList[value]['value'];
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     initialValue.value = value;
     await queryFollowDynamic();
@@ -221,7 +220,25 @@ class DynamicsController extends GetxController {
         print('DYNAMIC_TYPE_PGC_UNION 番剧');
         DynamicArchiveModel pgc = item.modules.moduleDynamic.major.pgc;
         if (pgc.epid != null) {
-          RoutePush.bangumiPush(null, pgc.epid);
+          SmartDialog.showLoading(msg: '获取中...');
+          var res = await SearchHttp.bangumiInfo(epId: pgc.epid);
+          SmartDialog.dismiss();
+          if (res['status']) {
+            EpisodeItem episode = res['data'].episodes.first;
+            String bvid = episode.bvid!;
+            int cid = episode.cid!;
+            String pic = episode.cover!;
+            String heroTag = Utils.makeHeroTag(cid);
+            Get.toNamed(
+              '/video?bvid=$bvid&cid=$cid&seasonId=${res['data'].seasonId}',
+              arguments: {
+                'pic': pic,
+                'heroTag': heroTag,
+                'videoType': SearchType.media_bangumi,
+                'bangumiItem': res['data'],
+              },
+            );
+          }
         }
         break;
     }
@@ -229,11 +246,11 @@ class DynamicsController extends GetxController {
 
   Future queryFollowUp({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录', 'code': -101};
+      return {'status': false, 'msg': '账号未登录'};
     }
     if (type == 'init') {
-      upData.value.upList = <UpItem>[];
+      upData.value.upList = [];
-      upData.value.liveList = <LiveUserItem>[];
+      upData.value.liveUsers = LiveUsers();
     }
     var res = await DynamicsHttp.followUp();
     if (res['status']) {
@@ -241,23 +258,20 @@ class DynamicsController extends GetxController {
       if (upData.value.upList!.isEmpty) {
         mid.value = -1;
       }
-      upData.value.upList!.insertAll(0, [
-        UpItem(face: '', uname: '全部动态', mid: -1),
-        UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid),
-      ]);
     }
     return res;
   }
 
   onSelectUp(mid) async {
     dynamicsType.value = DynamicsType.values[0];
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     queryFollowDynamic();
   }
 
   onRefresh() async {
     page = 1;
+    print('onRefresh');
     await queryFollowUp();
     await queryFollowDynamic();
   }
@@ -279,7 +293,7 @@ class DynamicsController extends GetxController {
     dynamicsType.value = DynamicsType.values[0];
     initialValue.value = 0;
     SmartDialog.showToast('还原默认加载');
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     queryFollowDynamic();
   }
 }

lib/pages/dynamics/detail/controller.dart

@@ -17,7 +17,7 @@ class DynamicDetailController extends GetxController {
   int currentPage = 0;
   bool isLoadingMore = false;
   RxString noMore = ''.obs;
-  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
+  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
   RxInt acount = 0.obs;
   final ScrollController scrollController = ScrollController();
 
@@ -25,7 +25,6 @@ class DynamicDetailController extends GetxController {
   RxString sortTypeTitle = ReplySortType.time.titles.obs;
   RxString sortTypeLabel = ReplySortType.time.labels.obs;
   Box setting = GStrorage.setting;
-  RxInt replyReqCode = 200.obs;
 
   @override
   void onInit() {
@@ -38,10 +37,6 @@ 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;
@@ -85,7 +80,6 @@ class DynamicDetailController extends GetxController {
         replyList.addAll(replies);
       }
     }
-    replyReqCode.value = res['code'];
     isLoadingMore = false;
     return res;
   }
@@ -98,6 +92,9 @@ class DynamicDetailController extends GetxController {
         _sortType = ReplySortType.like;
         break;
       case ReplySortType.like:
+        _sortType = ReplySortType.reply;
+        break;
+      case ReplySortType.reply:
         _sortType = ReplySortType.time;
         break;
       default:

lib/pages/dynamics/detail/view.dart

@@ -16,7 +16,6 @@ import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 
-import '../../../models/video/reply/item.dart';
 import '../widgets/dynamic_panel.dart';
 
 class DynamicDetailPage extends StatefulWidget {
@@ -183,7 +182,6 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     scrollController.removeListener(() {});
     fabAnimationCtr.dispose();
     scrollController.dispose();
-    titleStreamC.close();
     super.dispose();
   }
 
@@ -212,7 +210,9 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         onRefresh: () async {
           await _dynamicDetailController.queryReplyList();
         },
-        child: CustomScrollView(
+        child: Stack(
+          children: [
+            CustomScrollView(
               controller: scrollController,
               slivers: [
                 if (action != 'comment')
@@ -230,7 +230,9 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                         border: Border(
                           top: BorderSide(
                             width: 0.6,
-                        color: Theme.of(context).dividerColor.withOpacity(0.05),
+                            color: Theme.of(context)
+                                .dividerColor
+                                .withOpacity(0.05),
                           ),
                         ),
                       ),
@@ -262,7 +264,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                   _dynamicDetailController.queryBySort(),
                               icon: const Icon(Icons.sort, size: 16),
                               label: Obx(() => Text(
-                                _dynamicDetailController.sortTypeLabel.value,
+                                    _dynamicDetailController
+                                        .sortTypeLabel.value,
                                     style: const TextStyle(fontSize: 13),
                                   )),
                             ),
@@ -279,22 +282,22 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                     if (snapshot.connectionState == ConnectionState.done) {
                       Map data = snapshot.data as Map;
                       if (snapshot.data['status']) {
-                    RxList<ReplyItemModel> replyList =
-                        _dynamicDetailController.replyList;
                         // 请求成功
                         return Obx(
-                      () => replyList.isEmpty &&
+                          () => _dynamicDetailController.replyList.isEmpty &&
                                   _dynamicDetailController.isLoadingMore
                               ? SliverList(
-                              delegate:
+                                  delegate: SliverChildBuilderDelegate(
-                                  SliverChildBuilderDelegate((context, index) {
+                                      (context, index) {
                                     return const VideoReplySkeleton();
                                   }, childCount: 8),
                                 )
                               : SliverList(
                                   delegate: SliverChildBuilderDelegate(
                                     (context, index) {
-                                  if (index == replyList.length) {
+                                      if (index ==
+                                          _dynamicDetailController
+                                              .replyList.length) {
                                         return Container(
                                           padding: EdgeInsets.only(
                                               bottom: MediaQuery.of(context)
@@ -321,21 +324,25 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                         );
                                       } else {
                                         return ReplyItem(
-                                      replyItem: replyList[index],
+                                          replyItem: _dynamicDetailController
+                                              .replyList[index],
                                           showReplyRow: true,
                                           replyLevel: '1',
                                           replyReply: (replyItem) =>
                                               replyReply(replyItem),
-                                      replyType: ReplyType.values[replyType],
+                                          replyType:
+                                              ReplyType.values[replyType],
                                           addReply: (replyItem) {
-                                        replyList[index]
+                                            _dynamicDetailController
-                                            .replies!
+                                                .replyList[index].replies!
                                                 .add(replyItem);
                                           },
                                         );
                                       }
                                     },
-                                childCount: replyList.length + 1,
+                                    childCount: _dynamicDetailController
+                                            .replyList.length +
+                                        1,
                                   ),
                                 ),
                         );
@@ -358,21 +365,18 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                 )
               ],
             ),
-      ),
+            Positioned(
-      floatingActionButton: SlideTransition(
+              bottom: MediaQuery.of(context).padding.bottom + 14,
+              right: 14,
+              child: SlideTransition(
                 position: Tween<Offset>(
                   begin: const Offset(0, 2),
                   end: const Offset(0, 0),
-        ).animate(
+                ).animate(CurvedAnimation(
-          CurvedAnimation(
                   parent: fabAnimationCtr,
                   curve: Curves.easeInOut,
-          ),
+                )),
-        ),
+                child: FloatingActionButton(
-        child: Obx(
-          () => _dynamicDetailController.replyReqCode.value == 12061
-              ? const SizedBox()
-              : FloatingActionButton(
                   heroTag: null,
                   onPressed: () {
                     feedBack();
@@ -405,6 +409,9 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                 ),
               ),
             ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/pages/dynamics/view.dart

@@ -3,18 +3,17 @@ import 'dart:async';
 import 'package:custom_sliding_segmented_control/custom_sliding_segmented_control.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/skeleton/dynamic_card.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/main_stream.dart';
-import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 
-import '../mine/controller.dart';
 import 'controller.dart';
 import 'widgets/dynamic_panel.dart';
 import 'widgets/up_panel.dart';
@@ -29,7 +28,6 @@ class DynamicsPage extends StatefulWidget {
 class _DynamicsPageState extends State<DynamicsPage>
     with AutomaticKeepAliveClientMixin {
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
-  final MineController mineController = Get.put(MineController());
   late Future _futureBuilderFuture;
   late Future _futureBuilderFutureUp;
   Box userInfoCache = GStrorage.userInfo;
@@ -44,6 +42,8 @@ class _DynamicsPageState extends State<DynamicsPage>
     _futureBuilderFuture = _dynamicsController.queryFollowDynamic();
     _futureBuilderFutureUp = _dynamicsController.queryFollowUp();
     scrollController = _dynamicsController.scrollController;
+    StreamController<bool> mainStream =
+        Get.find<MainController>().bottomBarStream;
     scrollController.addListener(
       () async {
         if (scrollController.position.pixels >=
@@ -53,7 +53,14 @@ class _DynamicsPageState extends State<DynamicsPage>
             _dynamicsController.queryFollowDynamic(type: 'onLoad');
           });
         }
-        handleScrollEvent(scrollController);
+
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          mainStream.add(true);
+        } else if (direction == ScrollDirection.reverse) {
+          mainStream.add(false);
+        }
       },
     );
 
@@ -167,7 +174,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                                   borderRadius: BorderRadius.circular(20),
                                 ),
                                 thumbDecoration: BoxDecoration(
-                                  color: Theme.of(context).colorScheme.surface,
+                                  color:
+                                      Theme.of(context).colorScheme.background,
                                   borderRadius: BorderRadius.circular(20),
                                 ),
                                 duration: const Duration(milliseconds: 300),
@@ -184,6 +192,22 @@ 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),
+              //       ),
+              //     ),
+              //   ),
+              // ),
             ],
           ),
         ),
@@ -205,8 +229,7 @@ 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(
@@ -217,6 +240,15 @@ 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) {
@@ -224,8 +256,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                   if (snapshot.data == null) {
                     return const SliverToBoxAdapter(child: SizedBox());
                   }
-                  Map? data = snapshot.data;
+                  Map data = snapshot.data;
-                  if (data != null && data['status']) {
+                  if (data['status']) {
                     List<DynamicItemModel> list =
                         _dynamicsController.dynamicsList;
                     return Obx(
@@ -250,19 +282,14 @@ class _DynamicsPageState extends State<DynamicsPage>
                     );
                   } else {
                     return HttpError(
-                      errMsg: data?['msg'] ?? '请求异常',
+                      errMsg: data['msg'],
-                      btnText: data?['code'] == -101 ? '去登录' : null,
                       fn: () {
-                        if (data?['code'] == -101) {
-                          RoutePush.loginRedirectPush();
-                        } else {
                         setState(() {
                           _futureBuilderFuture =
                               _dynamicsController.queryFollowDynamic();
                           _futureBuilderFutureUp =
                               _dynamicsController.queryFollowUp();
                         });
-                        }
                       },
                     );
                   }

lib/pages/dynamics/widgets/action_panel.dart

@@ -3,58 +3,38 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import 'package:status_bar_control/status_bar_control.dart';
-import 'rich_node_panel.dart';
 
 class ActionPanel extends StatefulWidget {
   const ActionPanel({
     super.key,
-    required this.item,
+    this.item,
   });
   // ignore: prefer_typing_uninitialized_variables
-  final DynamicItemModel item;
+  final item;
 
   @override
   State<ActionPanel> createState() => _ActionPanelState();
 }
 
-class _ActionPanelState extends State<ActionPanel>
+class _ActionPanelState extends State<ActionPanel> {
-    with TickerProviderStateMixin {
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
   late ModuleStatModel stat;
   bool isProcessing = false;
-  double defaultHeight = 260;
-  RxDouble height = 0.0.obs;
-  RxBool isExpand = false.obs;
-  late double statusHeight;
-  TextEditingController _inputController = TextEditingController();
-  FocusNode myFocusNode = FocusNode();
-  String _inputText = '';
-
   void Function()? handleState(Future Function() action) {
-    return isProcessing
+    return isProcessing ? null : () async {
-        ? null
+      setState(() => isProcessing = true);
-        : () async {
-            isProcessing = true;
       await action();
-            isProcessing = false;
+      setState(() => isProcessing = false);
     };
   }
-
   @override
   void initState() {
     super.initState();
-    stat = widget.item.modules!.moduleStat!;
+    stat = widget.item!.modules.moduleStat;
-    onInit();
-  }
-
-  onInit() async {
-    statusHeight = await StatusBarControl.getHeight;
   }
 
   // 动态点赞
@@ -63,7 +43,7 @@ class _ActionPanelState extends State<ActionPanel>
     var item = widget.item!;
     String dynamicId = item.idStr!;
     // 1 已点赞 2 不喜欢 0 未操作
-    Like like = item.modules!.moduleStat!.like!;
+    Like like = item.modules.moduleStat.like;
     int count = like.count == '点赞' ? 0 : int.parse(like.count ?? '0');
     bool status = like.status!;
     int up = status ? 2 : 1;
@@ -71,15 +51,15 @@ class _ActionPanelState extends State<ActionPanel>
     if (res['status']) {
       SmartDialog.showToast(!status ? '点赞成功' : '取消赞');
       if (up == 1) {
-        item.modules!.moduleStat!.like!.count = (count + 1).toString();
+        item.modules.moduleStat.like.count = (count + 1).toString();
-        item.modules!.moduleStat!.like!.status = true;
+        item.modules.moduleStat.like.status = true;
       } else {
         if (count == 1) {
-          item.modules!.moduleStat!.like!.count = '点赞';
+          item.modules.moduleStat.like.count = '点赞';
         } else {
-          item.modules!.moduleStat!.like!.count = (count - 1).toString();
+          item.modules.moduleStat.like.count = (count - 1).toString();
         }
-        item.modules!.moduleStat!.like!.status = false;
+        item.modules.moduleStat.like.status = false;
       }
       setState(() {});
     } else {
@@ -87,307 +67,17 @@ class _ActionPanelState extends State<ActionPanel>
     }
   }
 
-  // 转发动态预览
-  Widget dynamicPreview() {
-    ItemModulesModel? modules = widget.item.modules;
-    final String type = widget.item.type!;
-    String? cover = modules?.moduleAuthor?.face;
-    switch (type) {
-      /// 图文动态
-      case 'DYNAMIC_TYPE_DRAW':
-        cover = modules?.moduleDynamic?.major?.opus?.pics?.first.url;
-
-      /// 投稿
-      case 'DYNAMIC_TYPE_AV':
-        cover = modules?.moduleDynamic?.major?.archive?.cover;
-
-      /// 转发的动态
-      case 'DYNAMIC_TYPE_FORWARD':
-        String forwardType = widget.item.orig!.type!;
-        switch (forwardType) {
-          /// 图文动态
-          case 'DYNAMIC_TYPE_DRAW':
-            cover = modules?.moduleDynamic?.major?.opus?.pics?.first.url;
-
-          /// 投稿
-          case 'DYNAMIC_TYPE_AV':
-            cover = modules?.moduleDynamic?.major?.archive?.cover;
-
-          /// 专栏文章
-          case 'DYNAMIC_TYPE_ARTICLE':
-            cover = '';
-
-          /// 番剧
-          case 'DYNAMIC_TYPE_PGC':
-            cover = '';
-
-          /// 纯文字动态
-          case 'DYNAMIC_TYPE_WORD':
-            cover = '';
-
-          /// 直播
-          case 'DYNAMIC_TYPE_LIVE_RCMD':
-            cover = '';
-
-          /// 合集查看
-          case 'DYNAMIC_TYPE_UGC_SEASON':
-            cover = '';
-
-          /// 番剧
-          case 'DYNAMIC_TYPE_PGC_UNION':
-            cover = modules?.moduleDynamic?.major?.pgc?.cover;
-
-          default:
-            cover = '';
-        }
-
-      /// 专栏文章
-      case 'DYNAMIC_TYPE_ARTICLE':
-        cover = '';
-
-      /// 番剧
-      case 'DYNAMIC_TYPE_PGC':
-        cover = '';
-
-      /// 纯文字动态
-      case 'DYNAMIC_TYPE_WORD':
-        cover = '';
-
-      /// 直播
-      case 'DYNAMIC_TYPE_LIVE_RCMD':
-        cover = '';
-
-      /// 合集查看
-      case 'DYNAMIC_TYPE_UGC_SEASON':
-        cover = '';
-
-      /// 番剧查看
-      case 'DYNAMIC_TYPE_PGC_UNION':
-        cover = '';
-
-      default:
-        cover = '';
-    }
-    return Container(
-      width: double.infinity,
-      height: 95,
-      margin: const EdgeInsets.fromLTRB(12, 0, 12, 14),
-      decoration: BoxDecoration(
-        color:
-            Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4),
-        borderRadius: BorderRadius.circular(6),
-        border: Border(
-          left: BorderSide(
-              width: 4,
-              color: Theme.of(context).colorScheme.primary.withOpacity(0.8)),
-        ),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              '@${widget.item.modules!.moduleAuthor!.name}',
-              style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
-              ),
-            ),
-            const SizedBox(height: 8),
-            Row(
-              children: [
-                NetworkImgLayer(
-                  src: cover ?? '',
-                  width: 34,
-                  height: 34,
-                  type: 'emote',
-                ),
-                const SizedBox(width: 10),
-                Expanded(
-                  child: Text.rich(
-                    style: const TextStyle(height: 0),
-                    richNode(widget.item, context),
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ),
-                // Text(data)
-              ],
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  // 动态转发
-  void forwardHandler() async {
-    showModalBottomSheet(
-      context: context,
-      enableDrag: false,
-      useRootNavigator: true,
-      isScrollControlled: true,
-      builder: (context) {
-        return Obx(
-          () => AnimatedContainer(
-            duration: Durations.medium1,
-            onEnd: () async {
-              if (isExpand.value) {
-                await Future.delayed(const Duration(milliseconds: 80));
-                myFocusNode.requestFocus();
-              }
-            },
-            height: height.value + MediaQuery.of(context).padding.bottom,
-            child: Column(
-              children: [
-                AnimatedContainer(
-                  duration: Durations.medium1,
-                  height: isExpand.value ? statusHeight : 0,
-                ),
-                Padding(
-                  padding: EdgeInsets.fromLTRB(
-                    isExpand.value ? 10 : 16,
-                    10,
-                    isExpand.value ? 14 : 12,
-                    0,
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      if (isExpand.value) ...[
-                        IconButton(
-                          onPressed: () => togglePanelState(false),
-                          icon: const Icon(Icons.close),
-                        ),
-                        Text(
-                          '转发动态',
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleMedium!
-                              .copyWith(fontWeight: FontWeight.bold),
-                        )
-                      ] else ...[
-                        const Text(
-                          '转发动态',
-                          style: TextStyle(fontWeight: FontWeight.bold),
-                        )
-                      ],
-                      isExpand.value
-                          ? FilledButton(
-                              onPressed: () => dynamicForward('forward'),
-                              child: const Text('转发'),
-                            )
-                          : TextButton(
-                              onPressed: () {},
-                              child: const Text('立即转发'),
-                            )
-                    ],
-                  ),
-                ),
-                if (!isExpand.value) ...[
-                  GestureDetector(
-                    onTap: () => togglePanelState(true),
-                    behavior: HitTestBehavior.translucent,
-                    child: Container(
-                      width: double.infinity,
-                      alignment: Alignment.centerLeft,
-                      padding: const EdgeInsets.fromLTRB(16, 0, 10, 14),
-                      child: Text(
-                        '说点什么吧',
-                        textAlign: TextAlign.start,
-                        style: TextStyle(
-                            color: Theme.of(context).colorScheme.outline),
-                      ),
-                    ),
-                  ),
-                ] else ...[
-                  Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 10, 16, 0),
-                    child: TextField(
-                      maxLines: 5,
-                      focusNode: myFocusNode,
-                      controller: _inputController,
-                      onChanged: (value) {
-                        setState(() {
-                          _inputText = value;
-                        });
-                      },
-                      decoration: const InputDecoration(
-                        border: InputBorder.none,
-                        hintText: '说点什么吧',
-                      ),
-                    ),
-                  ),
-                ],
-                dynamicPreview(),
-                if (!isExpand.value) ...[
-                  const Divider(thickness: 0.1, height: 1),
-                  ListTile(
-                    onTap: () => Get.back(),
-                    minLeadingWidth: 0,
-                    dense: true,
-                    title: Text(
-                      '取消',
-                      style: TextStyle(
-                          color: Theme.of(context).colorScheme.outline),
-                      textAlign: TextAlign.center,
-                    ),
-                  ),
-                ]
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  togglePanelState(status) {
-    if (!status) {
-      Get.back();
-      height.value = defaultHeight;
-      _inputText = '';
-      _inputController.clear();
-    } else {
-      height.value = Get.size.height;
-    }
-    isExpand.value = !(isExpand.value);
-  }
-
-  dynamicForward(String type) async {
-    String dynamicId = widget.item.idStr!;
-    var res = await DynamicsHttp.dynamicCreate(
-      dynIdStr: dynamicId,
-      mid: _dynamicsController.userInfo.mid,
-      rawText: _inputText,
-      scene: 4,
-    );
-    if (res['status']) {
-      SmartDialog.showToast(type == 'forward' ? '转发成功' : '发布成功');
-      togglePanelState(false);
-    }
-  }
-
-  @override
-  void dispose() {
-    myFocusNode.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     var color = Theme.of(context).colorScheme.outline;
     var primary = Theme.of(context).colorScheme.primary;
-    height.value = defaultHeight;
-    print('height.value: ${height.value}');
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceAround,
       children: [
         Expanded(
           flex: 1,
           child: TextButton.icon(
-            onPressed: forwardHandler,
+            onPressed: () {},
             icon: const Icon(
               FontAwesomeIcons.shareFromSquare,
               size: 16,

lib/pages/dynamics/widgets/additional_panel.dart

@@ -19,7 +19,7 @@ Widget addWidget(item, context, type, {floor = 1}) {
   };
   Color bgColor = floor == 1
       ? Theme.of(context).dividerColor.withOpacity(0.08)
-      : Theme.of(context).colorScheme.surface;
+      : Theme.of(context).colorScheme.background;
   switch (type) {
     case 'ADDITIONAL_TYPE_UGC':
       // 转发的投稿

lib/pages/dynamics/widgets/article_panel.dart

@@ -34,25 +34,25 @@ Widget articlePanel(item, context, {floor = 1}) {
           ),
           const SizedBox(height: 8),
         ],
-        // Text(
+        Text(
-        //   item.modules.moduleDynamic.major.opus.title,
+          item.modules.moduleDynamic.major.opus.title,
-        //   style: Theme.of(context)
+          style: Theme.of(context)
-        //       .textTheme
+              .textTheme
-        //       .titleMedium!
+              .titleMedium!
-        //       .copyWith(fontWeight: FontWeight.bold),
+              .copyWith(fontWeight: FontWeight.bold),
-        // ),
+        ),
-        // const SizedBox(height: 2),
+        const SizedBox(height: 2),
-        // if (item.modules.moduleDynamic.major.opus.summary.text !=
+        if (item.modules.moduleDynamic.major.opus.summary.text !=
-        //     'undefined') ...[
+            'undefined') ...[
-        //   Text(
+          Text(
-        //     item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
+            item.modules.moduleDynamic.major.opus.summary.richTextNodes.first
-        //         .text,
+                .text,
-        //     maxLines: 4,
+            maxLines: 4,
-        //     style: const TextStyle(height: 1.55),
+            style: const TextStyle(height: 1.55),
-        //     overflow: TextOverflow.ellipsis,
+            overflow: TextOverflow.ellipsis,
-        //   ),
+          ),
-        //   const SizedBox(height: 2),
+          const SizedBox(height: 2),
-        // ],
+        ],
         picWidget(item, context)
       ],
     ),