v1.0.14 更新

Refactor danmaku controller

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
               if: steps.cache-flutter.outputs.cache-hit != 'true'
               uses: subosito/flutter-action@v2
               with:
-                  flutter-version: 3.10.6
+                  flutter-version: 3.16.4
                   channel: any
 
             - name: 下载项目依赖

README.md

@@ -3,16 +3,23 @@
 </div>
 
 
+
 <div align="center">
     <h1>PiliPala</h1>
+<div align="center">
+    
+![GitHub repo size](https://img.shields.io/github/repo-size/guozhigq/pilipala) 
+![GitHub Repo stars](https://img.shields.io/github/stars/guozhigq/pilipala) 
+![GitHub all releases](https://img.shields.io/github/downloads/guozhigq/pilipala/total) 
+</div>
     <p>使用Flutter开发的BiliBili第三方客户端</p>
-    <br/>
-     <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/510shots_so.png" width="32%" alt="home" />
-    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/174shots_so.png" width="32%" alt="home" />
-    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/850shots_so.png" width="32%" alt="home" />
-    <br/>
-    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/main_screen.png" width="96%" alt="home" />
-    <br/>
+    
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/510shots_so.png" width="32%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/174shots_so.png" width="32%" alt="home" />
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/850shots_so.png" width="32%" alt="home" />
+<br/>
+<img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/main_screen.png" width="96%" alt="home" />
+<br/>
 </div>
 
 ## 开发环境

android/app/build.gradle

@@ -63,6 +63,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         minSdkVersion 19
+        multiDexEnabled true
     }
 
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -39,9 +39,13 @@
         android:label="PiliPala"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:enableOnBackInvokedCallback="true">
+        xmlns:tools="http://schemas.android.com/tools"
+        android:enableOnBackInvokedCallback="true"
+        android:allowBackup="false"
+        android:fullBackupContent="false"
+        tools:replace="android:allowBackup">
         <activity
-            android:name=".MainActivity"
+            android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
@@ -222,6 +226,24 @@
 
             </intent-filter>
         </activity>
+        <service 
+            android:name="com.ryanheise.audioservice.AudioService"
+            android:foregroundServiceType="mediaPlayback"
+            android:exported="true" 
+            tools:ignore="Instantiatable">
+            <intent-filter>
+                <action android:name="android.media.browse.MediaBrowserService" />
+            </intent-filter>
+        </service>
+
+        <receiver 
+            android:name="com.ryanheise.audioservice.MediaButtonReceiver"
+            android:exported="true" 
+            tools:ignore="Instantiatable">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver> 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -234,6 +256,8 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <!--
       Media access permissions.
       Android 13 or higher.

android/app/src/main/res/drawable/ic_baseline_forward_10_24.xml

@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
+</vector>

android/app/src/main/res/drawable/ic_baseline_replay_10_24.xml

@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/raw/keep.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+  tools:keep="@drawable/*" />

change_log/1.0.10.1016.md

@@ -0,0 +1,4 @@
+## 1.0.10
+
+### 修复
++ 长按倍速抬起后未恢复默认倍速

change_log/1.0.11.1112.md

@@ -0,0 +1,26 @@
+## 1.0.11
+
+### 新功能
++ 适配了原生媒体通知栏 @Daydreamer-riri
++ 视频主题图标 @Daydreamer-riri
++ 关闭软件后自动画中画播放
++ UP主分组管理
++ md2样式底栏
++ 
+
+ 
+### 修复
++ 历史记录记忆播放
++ 部分类型视频连播
++ 播放速度选择框不支持返回手势
++ 播放速度选择框不支持返回手势
++ 视频播放速度总是显示1.0X
++ 评论页面计数错误
++ 退出视频还有声音
+
+  
+### 优化
++ 视频加载速度
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.12.1114.md

@@ -0,0 +1,11 @@
+## 1.0.12
+
+ 
+### 修复
++ iOS端视频播放时没有声音
++ 超过6分钟弹幕不显示
++ 视频详情页网络异常
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.13.1217.md

@@ -0,0 +1,22 @@
+## 1.0.13
+
+
+### 新功能
++ 视频详情页稍后再看
++ 发送弹幕 感谢@orz12
++ 消息展示
++ up主页显示获赞数
++ up主页显示合集
++ 视频详情页「ai总结」增加开关
+  
+### 修复
++ 首页推荐问题（需要重新登录）
++ 长按倍速逻辑
++ 视频详情页网络异常
+
+### 优化
++ 设置面板样式 感谢@GuMengYu @KoolShow
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.14.1225.md

@@ -0,0 +1,28 @@
+## 1.0.14
+
+圣诞节快乐～ 🎉
+
+大部分内容由@orz12提供，感谢👏
+
+### 修复
++ 全屏弹幕消失
++ iOS全屏/退出全屏视频暂停
++ 个人主页关注状态
++ 视频合集向下滑动UI问题
++ 媒体库滑动底栏不隐藏
++ 个人主页动态加载问题 * 2
++ 未登录状态访问个人主页异常
++ 视频搜索标题特殊字符转义
++ iOS闪退
++ 消息页面夜间模式异常
++ 消息页面含有撤回消息时异常
++ 弹幕速度
+
+### 优化
++ 全屏播放方案优化
++ 弹幕加载逻辑优化
++ 点赞、投币逻辑优化
++ 进度条及播放时间渲染优化
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.7.0908.md

@@ -0,0 +1,22 @@
+## 1.0.7
+
+默认倍速、直播弹幕、专栏等功能开发中
+
+### 新功能
++ 弹幕设置、屏蔽功能
++ 不是很完美的后台播放功能
++ 不是很完美的画中画(pip)功能（Android端）
+ 
+### 修复
++ 动态页面加载异常
++ 网络异常时页面空白
++ 竖屏全屏状态栏问题
++ iOS端代理请求异常
+  
+### 优化
++ 图片预览
++ 全屏播放时自动旋转
++ 转发内容增加视频标题
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.8.0917.md

@@ -0,0 +1,24 @@
+## 1.0.8
+
+直播弹幕、循环播放等功能开发中
+
+### 新功能
++ 用户拉黑功能
++ gif图片保存
++ 删除已看历史记录
+ 
+### 修复
++ 弹幕数量较少
++ 弹幕屏蔽设置自动记忆
++ 动态页面渲染
++ 用户主页数据错乱
++ 大家都在搜空白
++ 默认自动全屏，顶部操作栏丢失
+  
+  
+### 优化
++ 全屏状态栏区域显示优化
++ 图片保存至PiliPala文件夹
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

change_log/1.0.9.1015.md

@@ -0,0 +1,28 @@
+## 1.0.9
+
+
+### 新功能
++ 自定义倍速、默认倍速
++ 历史记录搜索
++ 收藏夹搜索
++ 历史记录多选删除
++ 视频循环播放
++ 免登录看1080P
++ 评论区视频链接跳转
++ up主分组
++ up主投稿搜索
+ 
+### 修复
++ 搜索视频标题乱码
++ 屏幕帧率
++ 动态页面渲染
+
+  
+  
+### 优化
++ 快进手势
++ 视频简介链接匹配
++ 视频全屏时安全区域
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

ios/Podfile

@@ -37,5 +37,11 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
+      if !deployment_target.nil? && !deployment_target.empty? && deployment_target.to_f < 12.0
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+      end
+    end
   end
 end

ios/Podfile.lock

@@ -1,6 +1,12 @@
 PODS:
   - appscheme (1.0.4):
     - Flutter
+  - audio_service (0.0.1):
+    - Flutter
+  - audio_session (0.0.1):
+    - Flutter
+  - auto_orientation (0.0.1):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
@@ -12,8 +18,10 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - image_gallery_saver (2.0.2):
+  - gt3_flutter_plugin (0.0.8):
     - Flutter
+    - GT3Captcha-iOS
+  - GT3Captcha-iOS (0.15.8.3)
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -28,6 +36,8 @@ PODS:
   - permission_handler_apple (9.1.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
+  - saver_gallery (0.0.1):
+    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - share_plus (0.0.1):
@@ -37,6 +47,8 @@ PODS:
     - FMDB (>= 2.7.5)
   - status_bar_control (3.2.1):
     - Flutter
+  - system_proxy (0.0.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
   - volume_controller (0.0.1):
@@ -50,21 +62,26 @@ PODS:
 
 DEPENDENCIES:
   - appscheme (from `.symlinks/plugins/appscheme/ios`)
+  - 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/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
+  - gt3_flutter_plugin (from `.symlinks/plugins/gt3_flutter_plugin/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - status_bar_control (from `.symlinks/plugins/status_bar_control/ios`)
+  - system_proxy (from `.symlinks/plugins/system_proxy/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
@@ -74,11 +91,18 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - FMDB
+    - GT3Captcha-iOS
     - ReachabilitySwift
 
 EXTERNAL SOURCES:
   appscheme:
     :path: ".symlinks/plugins/appscheme/ios"
+  audio_service:
+    :path: ".symlinks/plugins/audio_service/ios"
+  audio_session:
+    :path: ".symlinks/plugins/audio_session/ios"
+  auto_orientation:
+    :path: ".symlinks/plugins/auto_orientation/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
@@ -87,8 +111,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-  image_gallery_saver:
-    :path: ".symlinks/plugins/image_gallery_saver/ios"
+  gt3_flutter_plugin:
+    :path: ".symlinks/plugins/gt3_flutter_plugin/ios"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_native_event_loop:
@@ -101,6 +125,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
+  saver_gallery:
+    :path: ".symlinks/plugins/saver_gallery/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
@@ -109,6 +135,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/ios"
   status_bar_control:
     :path: ".symlinks/plugins/status_bar_control/ios"
+  system_proxy:
+    :path: ".symlinks/plugins/system_proxy/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   volume_controller:
@@ -122,29 +150,35 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8
+  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
+  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
+  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
+  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: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
-PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
+PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

ios/Runner.xcodeproj/project.pbxproj

@@ -121,7 +121,6 @@
 				3DA6FBBC55FDD1E3261D6D67 /* Pods-Runner.release.xcconfig */,
 				32E2926120A1A8DC0E629BC6 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -140,6 +139,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				5A372F23F3CF0118D6526BAC /* [CP] Embed Pods Frameworks */,
+				B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -268,6 +268,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -343,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -359,7 +376,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -421,7 +438,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -470,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -488,7 +505,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -511,7 +528,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

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

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

ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="-11" y="-41"/>
         </scene>
     </scenes>
 </document>

ios/Runner/Info.plist

@@ -103,5 +103,9 @@
 				</array>
 			</dict>
 		</array>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>audio</string>
+		</array>
 	</dict>
 </plist>

lib/common/constants.dart

@@ -9,7 +9,11 @@ class StyleString {
 }
 
 class Constants {
-  static const String appKey = '27eb53fc9058f8c3';
+  // 27eb53fc9058f8c3  移动端 Android
+  // 4409e2ce8ffd12b8  TV端
+  static const String appKey = '4409e2ce8ffd12b8';
+  // 59b43e04ad6965f34319062b478f83dd TV端
+  static const String appSec = '59b43e04ad6965f34319062b478f83dd';
   static const String thirdSign = '04224646d1fea004e79606d3b038c84a';
   static const String thirdApi =
       'https://www.mcbbs.net/template/mcbbs/image/special_photo_bg.png';

lib/common/widgets/badge.dart

@@ -1,37 +1,5 @@
 import 'package:flutter/material.dart';
 
-// Widget pBadge(
-//   text,
-//   context,
-//   double? top,
-//   double? right,
-//   double? bottom,
-//   double? left, {
-//   type = 'primary',
-// }) {
-//   Color bgColor = Theme.of(context).colorScheme.primary;
-//   Color color = Theme.of(context).colorScheme.onPrimary;
-//   if (type == 'gray') {
-//     bgColor = Colors.black54.withOpacity(0.4);
-//     color = Colors.white;
-//   }
-//   return Positioned(
-//     top: top,
-//     left: left,
-//     right: right,
-//     bottom: bottom,
-//     child: Container(
-//       padding: const EdgeInsets.symmetric(vertical: 1, horizontal: 6),
-//       decoration:
-//           BoxDecoration(borderRadius: BorderRadius.circular(4), color: bgColor),
-//       child: Text(
-//         text,
-//         style: TextStyle(fontSize: 11, color: color),
-//       ),
-//     ),
-//   );
-// }
-
 class PBadge extends StatelessWidget {
   final String? text;
   final double? top;

lib/common/widgets/content_container.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+
+class ContentContainer extends StatelessWidget {
+  final Widget? contentWidget;
+  final Widget? bottomWidget;
+  final bool isScrollable;
+  final Clip? childClipBehavior;
+
+  const ContentContainer(
+      {Key? key,
+      this.contentWidget,
+      this.bottomWidget,
+      this.isScrollable = true,
+      this.childClipBehavior})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (BuildContext context, BoxConstraints constraints) {
+        return SingleChildScrollView(
+          clipBehavior: childClipBehavior ?? Clip.hardEdge,
+          physics: isScrollable ? null : NeverScrollableScrollPhysics(),
+          child: ConstrainedBox(
+            constraints: constraints.copyWith(
+              minHeight: constraints.maxHeight,
+              maxHeight: double.infinity,
+            ),
+            child: IntrinsicHeight(
+              child: Column(
+                children: <Widget>[
+                  if (contentWidget != null)
+                    Expanded(
+                      child: contentWidget!,
+                    )
+                  else
+                    Spacer(),
+                  if (bottomWidget != null) bottomWidget!,
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

lib/common/widgets/html_render.dart

@@ -0,0 +1,96 @@
+import 'package:get/get.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+
+// ignore: must_be_immutable
+class HtmlRender extends StatelessWidget {
+  String? htmlContent;
+  final int? imgCount;
+  final List? imgList;
+
+  HtmlRender({
+    this.htmlContent,
+    this.imgCount,
+    this.imgList,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Html(
+      data: htmlContent,
+      onLinkTap: (url, buildContext, attributes) => {},
+      extensions: [
+        TagExtension(
+          tagsToExtend: {"img"},
+          builder: (extensionContext) {
+            try {
+              Map attributes = extensionContext.attributes;
+              List key = attributes.keys.toList();
+              String? imgUrl = key.contains('src')
+                  ? attributes['src']
+                  : attributes['data-src'];
+              if (imgUrl!.startsWith('//')) {
+                imgUrl = 'https:$imgUrl';
+              }
+              if (imgUrl.startsWith('http://')) {
+                imgUrl = imgUrl.replaceAll('http://', 'https://');
+              }
+              imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
+              bool isEmote = imgUrl.contains('/emote/');
+              bool isMall = imgUrl.contains('/mall/');
+              if (isMall) {
+                return const SizedBox();
+              }
+              // bool inTable =
+              //     extensionContext.element!.previousElementSibling == null ||
+              //         extensionContext.element!.nextElementSibling == null;
+              // imgUrl = Utils().imageUrl(imgUrl!);
+              // return Image.network(
+              //   imgUrl,
+              //   width: isEmote ? 22 : null,
+              //   height: isEmote ? 22 : null,
+              // );
+              return NetworkImgLayer(
+                width: isEmote ? 22 : Get.size.width - 24,
+                height: isEmote ? 22 : 200,
+                src: imgUrl,
+              );
+            } catch (err) {
+              print(err);
+              return const SizedBox();
+            }
+          },
+        ),
+      ],
+      style: {
+        "html": Style(
+          fontSize: FontSize.medium,
+          lineHeight: LineHeight.percent(140),
+        ),
+        "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero),
+        "a": Style(
+          color: Theme.of(context).colorScheme.primary,
+          textDecoration: TextDecoration.none,
+        ),
+        "p": Style(
+          margin: Margins.only(bottom: 10),
+        ),
+        "span": Style(
+          fontSize: FontSize.medium,
+          height: Height(1.65),
+        ),
+        "div": Style(height: Height.auto()),
+        "li > p": Style(
+          display: Display.inline,
+        ),
+        "li": Style(
+          padding: HtmlPaddings.only(bottom: 4),
+          textAlign: TextAlign.justify,
+        ),
+        "img": Style(margin: Margins.only(top: 4, bottom: 4)),
+      },
+    );
+  }
+}

lib/common/widgets/video_card_h.dart

@@ -17,6 +17,10 @@ class VideoCardH extends StatelessWidget {
   final Function()? longPress;
   final Function()? longPressEnd;
   final String source;
+  final bool showOwner;
+  final bool showView;
+  final bool showDanmaku;
+  final bool showPubdate;
 
   const VideoCardH({
     Key? key,
@@ -24,6 +28,10 @@ class VideoCardH extends StatelessWidget {
     this.longPress,
     this.longPressEnd,
     this.source = 'normal',
+    this.showOwner = true,
+    this.showView = true,
+    this.showDanmaku = true,
+    this.showPubdate = false,
   }) : super(key: key);
 
   @override
@@ -103,7 +111,14 @@ class VideoCardH extends StatelessWidget {
                         },
                       ),
                     ),
-                    VideoContent(videoItem: videoItem, source: source)
+                    VideoContent(
+                      videoItem: videoItem,
+                      source: source,
+                      showOwner: showOwner,
+                      showView: showView,
+                      showDanmaku: showDanmaku,
+                      showPubdate: showPubdate,
+                    )
                   ],
                 ),
               );
@@ -119,8 +134,20 @@ class VideoContent extends StatelessWidget {
   // ignore: prefer_typing_uninitialized_variables
   final videoItem;
   final String source;
-  const VideoContent(
-      {super.key, required this.videoItem, this.source = 'normal'});
+  final bool showOwner;
+  final bool showView;
+  final bool showDanmaku;
+  final bool showPubdate;
+
+  const VideoContent({
+    super.key,
+    required this.videoItem,
+    this.source = 'normal',
+    this.showOwner = true,
+    this.showView = true,
+    this.showDanmaku = true,
+    this.showPubdate = false,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -179,34 +206,40 @@ class VideoContent extends StatelessWidget {
             //     ),
             //   ),
             // const SizedBox(height: 4),
-            Row(
-              children: [
-                Text(
-                  videoItem.owner.name,
-                  style: TextStyle(
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                    color: Theme.of(context).colorScheme.outline,
+            if (showPubdate)
+              Text(
+                Utils.dateFormat(videoItem.pubdate!),
+                style: TextStyle(
+                    fontSize: 11, color: Theme.of(context).colorScheme.outline),
+              ),
+            if (showOwner)
+              Row(
+                children: [
+                  Text(
+                    videoItem.owner.name,
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
                   ),
-                ),
-              ],
-            ),
+                ],
+              ),
             Row(
               children: [
-                StatView(
-                  theme: 'gray',
-                  view: videoItem.stat.view,
-                ),
-                const SizedBox(width: 8),
-                StatDanMu(
-                  theme: 'gray',
-                  danmu: videoItem.stat.danmaku,
-                ),
-                // Text(
-                //   Utils.dateFormat(videoItem.pubdate!),
-                //   style: TextStyle(
-                //       fontSize: 11,
-                //       color: Theme.of(context).colorScheme.outline),
-                // )
+                if (showView) ...[
+                  StatView(
+                    theme: 'gray',
+                    view: videoItem.stat.view,
+                  ),
+                  const SizedBox(width: 8),
+                ],
+                if (showDanmaku)
+                  StatDanMu(
+                    theme: 'gray',
+                    danmu: videoItem.stat.danmaku,
+                  ),
+
                 const Spacer(),
                 // SizedBox(
                 //   width: 20,

lib/common/widgets/video_card_v.dart

@@ -5,6 +5,7 @@ import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -27,6 +28,11 @@ class VideoCardV extends StatelessWidget {
     this.longPressEnd,
   }) : super(key: key);
 
+  bool isStringNumeric(String str) {
+    RegExp numericRegex = RegExp(r'^\d+$');
+    return numericRegex.hasMatch(str);
+  }
+
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
     switch (goto) {
@@ -62,6 +68,47 @@ class VideoCardV extends StatelessWidget {
           'heroTag': heroTag,
         });
         break;
+      // 动态
+      case 'picture':
+        try {
+          String dynamicType = 'picture';
+          String uri = videoItem.uri;
+          String id = '';
+          if (videoItem.uri.startsWith('bilibili://article/')) {
+            // https://www.bilibili.com/read/cv27063554
+            dynamicType = 'read';
+            RegExp regex = RegExp(r'\d+');
+            Match match = regex.firstMatch(videoItem.uri)!;
+            String matchedNumber = match.group(0)!;
+            videoItem.param = int.parse(matchedNumber);
+            id = 'cv${videoItem.param}';
+          }
+          if (uri.startsWith('http')) {
+            String path = Uri.parse(uri).path;
+            if (isStringNumeric(path.split('/')[1])) {
+              // 请求接口
+              var res =
+                  await DynamicsHttp.dynamicDetail(id: path.split('/')[1]);
+              if (res['status']) {
+                Get.toNamed('/dynamicDetail', arguments: {
+                  'item': res['data'],
+                  'floor': 1,
+                  'action': 'detail'
+                });
+              }
+              return;
+            }
+          }
+          Get.toNamed('/htmlRender', parameters: {
+            'url': uri,
+            'title': videoItem.title,
+            'id': id,
+            'dynamicType': dynamicType
+          });
+        } catch (err) {
+          SmartDialog.showToast(err.toString());
+        }
+        break;
       default:
         SmartDialog.showToast(videoItem.goto);
         Get.toNamed(
@@ -112,12 +159,22 @@ class VideoCardV extends StatelessWidget {
                           height: maxHeight,
                         ),
                       ),
-                      if (crossAxisCount == 1 && videoItem.duration != null)
-                        PBadge(
-                          bottom: 10,
-                          right: 10,
-                          text: videoItem.duration,
-                        )
+                      if (videoItem.duration != null)
+                        if (crossAxisCount == 1) ...[
+                          PBadge(
+                            bottom: 10,
+                            right: 10,
+                            text: videoItem.duration,
+                          )
+                        ] else ...[
+                          PBadge(
+                            bottom: 6,
+                            right: 7,
+                            size: 'small',
+                            type: 'gray',
+                            text: videoItem.duration,
+                          )
+                        ],
                     ],
                   );
                 }),
@@ -174,7 +231,7 @@ class VideoContent extends StatelessWidget {
               ],
             ),
             if (crossAxisCount > 1) ...[
-              const SizedBox(height: 3),
+              const SizedBox(height: 2),
               VideoStat(
                 videoItem: videoItem,
               ),
@@ -247,7 +304,7 @@ class VideoContent extends StatelessWidget {
                     },
                   ),
                 ] else ...[
-                  const SizedBox(height: 26)
+                  const SizedBox(height: 24)
                 ]
               ],
             ),
@@ -268,23 +325,20 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      children: [
-        Text(
-          '${videoItem.stat.view}观看',
-          style: TextStyle(
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-            color: Theme.of(context).colorScheme.outline,
-          ),
+    return RichText(
+      maxLines: 1,
+      text: TextSpan(
+        style: TextStyle(
+          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          color: Theme.of(context).colorScheme.outline,
         ),
-        Text(
-          ' • ${videoItem.stat.danmu}弹幕',
-          style: TextStyle(
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-            color: Theme.of(context).colorScheme.outline,
-          ),
-        ),
-      ],
+        children: [
+          if (videoItem.stat.view != '-')
+            TextSpan(text: '${videoItem.stat.view}观看'),
+          if (videoItem.stat.danmu != '-')
+            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
+        ],
+      ),
     );
   }
 }

lib/http/api.dart

@@ -97,6 +97,9 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
+  // 相互关系查询 // 失效
+  // static const String relationSearch = '/x/space/wbi/acc/relation';
+
   // 评论列表
   // https://api.bilibili.com/x/v2/reply/main?csrf=6e22efc1a47225ea25f901f922b5cfdd&mode=3&oid=254175381&pagination_str=%7B%22offset%22:%22%22%7D&plat=1&seek_rpid=0&type=11
   static const String replyList = '/x/v2/reply';
@@ -126,12 +129,14 @@ class Api {
   static const String userFavFolder = '/x/v3/fav/folder/created/list';
 
   /// 收藏夹 详情
-  /// media_id int 收藏夹id
+  /// media_id  当前收藏夹id 搜索全部时为默认收藏夹id
   /// pn int 当前页
   /// ps int pageSize
   /// keyword String 搜索词
   /// order String 排序方式 view 最多播放 mtime 最近收藏 pubtime 最近投稿
   /// tid int 分区id
+  /// platform web
+  /// type 0 当前收藏夹 1 全部收藏夹
   // https://api.bilibili.com/x/v3/fav/resource/list?media_id=76614671&pn=1&ps=20&keyword=&order=mtime&type=0&tid=0
   static const String userFavFolderDetail = '/x/v3/fav/resource/list';
 
@@ -164,6 +169,12 @@ class Api {
   // 清空历史记录
   static const String clearHistory = '/x/v2/history/clear';
 
+  // 删除某条历史记录
+  static const String delHistory = '/x/v2/history/delete';
+
+  // 搜索历史记录
+  static const String searchHistory = '/x/web-goblin/history/search';
+
   // 热搜
   static const String hotSearchList =
       'https://s.search.bilibili.com/main/hotword';
@@ -204,7 +215,7 @@ class Api {
   // 粉丝
   // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
   // order_type 排序规则 最近访问传空，最常访问传 attention
-  static const String fans = 'https://api.bilibili.com/x/relation/fans';
+  static const String fans = '/x/relation/fans';
 
   // 直播
   // ?page=1&page_size=30&platform=web
@@ -239,6 +250,9 @@ class Api {
   // wts=1689767832
   static const String memberArchive = '/x/space/wbi/arc/search';
 
+  // 用户动态搜索
+  static const String memberDynamicSearch = '/x/space/dynamic/search';
+
   // 用户动态
   static const String memberDynamic = '/x/polymer/web-dynamic/v1/feed/space';
 
@@ -285,6 +299,9 @@ class Api {
   // 黑名单
   static const String blackLst = '/x/relation/blacks';
 
+  // 移除黑名单
+  static const String removeBlack = '/x/relation/modify';
+
   // github 获取最新版
   static const String latestApp =
       'https://api.github.com/repos/guozhigq/pilipala/releases/latest';
@@ -294,4 +311,159 @@ class Api {
   static const String onlineTotal = '/x/player/online/total';
 
   static const String webDanmaku = '/x/v2/dm/web/seg.so';
+
+  //发送视频弹幕
+  //https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/danmaku/action.md
+  static const String shootDanmaku = '/x/v2/dm/post';
+
+  // up主分组
+  static const String followUpTag = '/x/relation/tags';
+
+  // 设置Up主分组
+  // 0 添加至默认分组  否则使用,分割tagid
+  static const String addUsers = '/x/relation/tags/addUsers';
+
+  // 获取指定分组下的up
+  static const String followUpGroup = '/x/relation/tag';
+
+  /// 私聊
+  ///  'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions?
+  /// session_type=1&
+  /// group_fold=1&
+  /// unfollow_fold=0&
+  /// sort_rule=2&
+  /// build=0&
+  /// mobi_app=web&
+  /// w_rid=8641d157fb9a9255eb2159f316ee39e2&
+  /// wts=1697305010
+
+  static const String sessionList =
+      'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions';
+
+  /// 私聊用户信息
+  /// uids
+  /// build=0&mobi_app=web
+  static const String sessionAccountList =
+      'https://api.vc.bilibili.com/account/v1/user/cards';
+
+  /// https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs?
+  /// talker_id=400787461&
+  /// session_type=1&
+  /// size=20&
+  /// sender_device_id=1&
+  /// build=0&
+  /// mobi_app=web&
+  /// web_location=333.1296&
+  /// w_rid=cfe3bf58c9fe181bbf4dd6c75175e6b0&
+  /// wts=1697350697
+
+  static const String sessionMsg =
+      'https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs';
+
+  /// 标记已读 POST
+  /// talker_id:
+  /// session_type: 1
+  /// ack_seqno: 920224140918926
+  /// build: 0
+  /// mobi_app: web
+  /// csrf_token:
+  /// csrf:
+  static const String updateAck =
+      'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack';
+
+  // 获取某个动态详情
+  // timezone_offset=-480
+  // id=849312409672744983
+  // features=itemOpusStyle
+  static const String dynamicDetail = '/x/polymer/web-dynamic/v1/detail';
+
+  // AI总结
+  /// https://api.bilibili.com/x/web-interface/view/conclusion/get?
+  /// bvid=BV1ju4y1s7kn&
+  /// cid=1296086601&
+  /// up_mid=4641697&
+  /// w_rid=1607c6c5a4a35a1297e31992220900ae&
+  /// wts=1697033079
+  static const String aiConclusion = '/x/web-interface/view/conclusion/get';
+
+  // captcha验证码
+  static const String getCaptcha =
+      'https://passport.bilibili.com/x/passport-login/captcha?source=main_web';
+
+  // web端短信验证码
+  static const String smsCode =
+      'https://passport.bilibili.com/x/passport-login/web/sms/send';
+
+  // web端验证码登录
+
+  // web端密码登录
+
+  // app端短信验证码
+  static const String appSmsCode =
+      'https://passport.bilibili.com/x/passport-login/sms/send';
+
+  // app端验证码登录
+
+  // 获取短信验证码
+  // static const String appSafeSmsCode =
+  //     'https://passport.bilibili.com/x/safecenter/common/sms/send';
+
+  /// app端密码登录
+  /// username
+  /// password
+  /// key
+  /// rhash
+  static const String loginInByPwdApi =
+      'https://passport.bilibili.com/x/passport-login/oauth2/login';
+
+  /// 密码加密密钥
+  /// disable_rcmd
+  /// local_id
+  static const getWebKey =
+      'https://passport.bilibili.com/x/passport-login/web/key';
+
+  /// cookie转access_key
+  static const cookieToKey =
+      'https://passport.bilibili.com/x/passport-tv-login/h5/qrcode/confirm';
+
+  /// 申请二维码(TV端)
+  static const getTVCode =
+      'https://passport.snm0516.aisee.tv/x/passport-tv-login/qrcode/auth_code';
+
+  ///扫码登录（TV端）
+  static const qrcodePoll =
+      'https://passport.bilibili.com/x/passport-tv-login/qrcode/poll';
+
+  /// 置顶视频
+  static const getTopVideoApi = '/x/space/top/arc';
+
+  /// 主页 - 最近投币的视频
+  /// vmid
+  /// gaia_source = main_web
+  /// web_location
+  /// w_rid
+  /// wts
+  static const getRecentCoinVideoApi = '/x/space/coin/video';
+
+  /// 最近点赞的视频
+  static const getRecentLikeVideoApi = '/x/space/like/video';
+
+  /// 最近追番
+  static const getRecentBangumiApi = '/x/space/bangumi/follow/list';
+
+  /// 用户专栏
+  static const getMemberSeasonsApi = '/x/polymer/web-space/home/seasons_series';
+
+  /// 获赞数 播放数
+  /// mid
+  static const getMemberViewApi = '/x/space/upstat';
+
+  /// 查询某个专栏
+  /// mid
+  /// season_id
+  /// sort_reverse
+  /// page_num
+  /// page_size
+  static const getSeasonDetailApi =
+      '/x/polymer/web-space/seasons_archives_list';
 }

lib/http/black.dart

@@ -23,4 +23,31 @@ class BlackHttp {
       };
     }
   }
+
+  // 移除黑名单
+  static Future removeBlack({required int fid}) async {
+    var res = await Request().post(
+      Api.removeBlack,
+      queryParameters: {
+        'act': 6,
+        'csrf': await Request.getCsrf(),
+        'fid': fid,
+        'jsonp': 'jsonp',
+        're_src': 116,
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': [],
+        'msg': '操作成功',
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/constants.dart

@@ -2,4 +2,37 @@ class HttpString {
   static const String baseUrl = 'https://www.bilibili.com';
   static const String baseApiUrl = 'https://api.bilibili.com';
   static const String tUrl = 'https://api.vc.bilibili.com';
+  static const List<int> validateStatusCodes = [
+    302,
+    304,
+    307,
+    400,
+    401,
+    403,
+    404,
+    405,
+    409,
+    412,
+    500,
+    503,
+    504,
+    509,
+    616,
+    617,
+    625,
+    626,
+    628,
+    629,
+    632,
+    643,
+    650,
+    652,
+    658,
+    662,
+    688,
+    689,
+    701,
+    799,
+    8888
+  ];
 }

lib/http/danmaku.dart

@@ -17,17 +17,79 @@ class DanmakaHttp {
       'oid': cid,
       'segment_index': segmentIndex,
     };
+    var response = await Request().get(
+      Api.webDanmaku,
+      data: params,
+      extra: {'resType': ResponseType.bytes},
+    );
+    return DmSegMobileReply.fromBuffer(response.data);
+  }
+  static Future shootDanmaku({
+    int type = 1,//弹幕类选择(1：视频弹幕 2：漫画弹幕)
+    required int oid,// 视频cid
+    required String msg,//弹幕文本(长度小于 100 字符)
+    int mode = 1,// 弹幕类型(1：滚动弹幕 4：底端弹幕 5：顶端弹幕 6：逆向弹幕(不能使用） 7：高级弹幕 8：代码弹幕（不能使用） 9：BAS弹幕（pool必须为2）)
+    // String? aid,// 稿件avid
+    // String? bvid,// bvid与aid必须有一个
+    required String bvid,
+    int? progress,// 弹幕出现在视频内的时间（单位为毫秒，默认为0）
+    int? color,// 弹幕颜色(默认白色，16777215）
+    int? fontsize,// 弹幕字号（默认25）
+    int? pool,// 弹幕池选择（0：普通池 1：字幕池 2：特殊池（代码/BAS弹幕）默认普通池，0）
+    //int? rnd,// 当前时间戳*1000000（若无此项，则发送弹幕冷却时间限制为90s；若有此项，则发送弹幕冷却时间限制为5s）
+    int? colorful,//60001：专属渐变彩色（需要会员）
+    int? checkbox_type,//是否带 UP 身份标识（0：普通；4：带有标识）
+    // String? csrf,//CSRF Token（位于 Cookie）	Cookie 方式必要
+    // String? access_key,//	APP 登录 Token		APP 方式必要
+  }) async {
+    // 构建参数对象
+    // assert(aid != null || bvid != null);
+    // assert(csrf != null || access_key != null);
+    assert(msg.length < 100);
+    // 构建参数对象
+    var params = <String, dynamic>{
+      'type': type,
+      'oid': oid,
+      'msg': msg,
+      'mode': mode,
+      //'aid': aid,
+      'bvid': bvid,
+      'progress': progress,
+      'color': color,
+      'fontsize': fontsize,
+      'pool': pool,
+      'rnd': DateTime.now().microsecondsSinceEpoch,
+      'colorful': colorful,
+      'checkbox_type': checkbox_type,
+      'csrf': await Request.getCsrf(),
+      // 'access_key': access_key,
+    }..removeWhere((key, value) => value == null);
 
-    // 计算函数
-    Future<DmSegMobileReply> computeTask(Map<String, int> params) async {
-      var response = await Request().get(
-        Api.webDanmaku,
-        data: params,
-        extra: {'resType': ResponseType.bytes},
-      );
-      return DmSegMobileReply.fromBuffer(response.data);
+    var response = await Request().post(
+      Api.shootDanmaku,
+      data: params,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    if (response.statusCode != 200) {
+      return {
+        'status': false,
+        'data': [],
+        'msg': '弹幕发送失败，状态码:${response.statusCode}',
+      };
+    }
+    if (response.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': response.data['data'],
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': "${response.data['code']}: ${response.data['message']}",
+      };
     }
-
-    return await compute(computeTask, params);
   }
 }

lib/http/dynamics.dart

@@ -28,6 +28,7 @@ class DynamicsHttp {
           'data': DynamicsDataModel.fromJson(res.data['data']),
         };
       } catch (err) {
+        print(err);
         return {
           'status': false,
           'data': [],
@@ -85,4 +86,35 @@ class DynamicsHttp {
       };
     }
   }
+
+  //
+  static Future dynamicDetail({
+    String? id,
+  }) async {
+    var res = await Request().get(Api.dynamicDetail, data: {
+      'timezone_offset': -480,
+      'id': id,
+      'features': 'itemOpusStyle',
+    });
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': DynamicItemModel.fromJson(res.data['data']['item']),
+        };
+      } catch (err) {
+        return {
+          'status': false,
+          'data': [],
+          'msg': err.toString(),
+        };
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/html.dart

@@ -0,0 +1,103 @@
+import 'package:html/dom.dart';
+import 'package:html/parser.dart';
+import 'package:pilipala/http/index.dart';
+
+class HtmlHttp {
+  // article
+  static Future reqHtml(id, dynamicType) async {
+    var response = await Request().get(
+      "https://www.bilibili.com/opus/$id",
+      extra: {'ua': 'pc'},
+    );
+
+    if (response.data.contains('Redirecting to')) {
+      RegExp regex = RegExp(r'//([\w\.]+)/(\w+)/(\w+)');
+      Match match = regex.firstMatch(response.data)!;
+      String matchedString = match.group(0)!;
+      response = await Request().get(
+        'https:$matchedString' + '/',
+        extra: {'ua': 'pc'},
+      );
+    }
+    try {
+      Document rootTree = parse(response.data);
+      // log(response.data.body.toString());
+      Element body = rootTree.body!;
+      Element appDom = body.querySelector('#app')!;
+      Element authorHeader = appDom.querySelector('.fixed-author-header')!;
+      // 头像
+      String avatar = authorHeader.querySelector('img')!.attributes['src']!;
+      avatar = 'https:${avatar.split('@')[0]}';
+      String uname = authorHeader
+          .querySelector('.fixed-author-header__author__name')!
+          .text;
+
+      // 动态详情
+      Element opusDetail = appDom.querySelector('.opus-detail')!;
+      // 发布时间
+      String updateTime =
+          opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+      //
+      String opusContent =
+          opusDetail.querySelector('.opus-module-content')!.innerHtml;
+      String test = opusDetail
+          .querySelector('.horizontal-scroll-album__pic__img')!
+          .innerHtml;
+      String commentId = opusDetail
+          .querySelector('.bili-comment-container')!
+          .className
+          .split(' ')[1]
+          .split('-')[2];
+      // List imgList = opusDetail.querySelectorAll('bili-album__preview__picture__img');
+      return {
+        'status': true,
+        'avatar': avatar,
+        'uname': uname,
+        'updateTime': updateTime,
+        'content': test + opusContent,
+        'commentId': int.parse(commentId)
+      };
+    } catch (err) {
+      print('err: $err');
+    }
+  }
+
+  // read
+  static Future reqReadHtml(id, dynamicType) async {
+    var response = await Request().get(
+      "https://www.bilibili.com/$dynamicType/$id/",
+      extra: {'ua': 'pc'},
+    );
+    Document rootTree = parse(response.data);
+    Element body = rootTree.body!;
+    Element appDom = body.querySelector('#app')!;
+    Element authorHeader = appDom.querySelector('.up-left')!;
+    // 头像
+    // String avatar =
+    //     authorHeader.querySelector('.bili-avatar-img')!.attributes['data-src']!;
+    // print(avatar);
+    // avatar = 'https:${avatar.split('@')[0]}';
+    String uname = authorHeader.querySelector('.up-name')!.text.trim();
+    // 动态详情
+    Element opusDetail = appDom.querySelector('.article-content')!;
+    // 发布时间
+    // String updateTime =
+    //     opusDetail.querySelector('.opus-module-author__pub__text')!.text;
+    // print(updateTime);
+
+    //
+    String opusContent =
+        opusDetail.querySelector('#read-article-holder')!.innerHtml;
+    RegExp digitRegExp = RegExp(r'\d+');
+    Iterable<Match> matches = digitRegExp.allMatches(id);
+    String number = matches.first.group(0)!;
+    return {
+      'status': true,
+      'avatar': '',
+      'uname': uname,
+      'updateTime': '',
+      'content': opusContent,
+      'commentId': int.parse(number)
+    };
+  }
+}

lib/http/init.dart

@@ -4,12 +4,13 @@ import 'dart:io';
 import 'dart:async';
 import 'package:dio/dio.dart';
 import 'package:cookie_jar/cookie_jar.dart';
+import 'package:dio/io.dart';
+import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/interceptor.dart';
-import 'package:dio_http2_adapter/dio_http2_adapter.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 
 class Request {
@@ -17,6 +18,11 @@ class Request {
   static late CookieManager cookieManager;
   static late final Dio dio;
   factory Request() => _instance;
+  Box setting = GStrorage.setting;
+  static Box localCache = GStrorage.localCache;
+  late dynamic enableSystemProxy;
+  late String systemProxyHost;
+  late String systemProxyPort;
 
   /// 设置cookie
   static setCookie() async {
@@ -41,8 +47,8 @@ class Request {
           log("setCookie, ${e.toString()}");
         }
       }
-      setOptionsHeaders(userInfo);
     }
+    setOptionsHeaders(userInfo, userInfo != null && userInfo.mid != null);
 
     if (cookie.isEmpty) {
       try {
@@ -60,9 +66,6 @@ class Request {
   static Future<String> getCsrf() async {
     var cookies = await cookieManager.cookieJar
         .loadForRequest(Uri.parse(HttpString.baseApiUrl));
-    // for (var i in cookies) {
-    //   print(i);
-    // }
     String token = '';
     if (cookies.where((e) => e.name == 'bili_jct').isNotEmpty) {
       token = cookies.firstWhere((e) => e.name == 'bili_jct').value;
@@ -70,8 +73,10 @@ class Request {
     return token;
   }
 
-  static setOptionsHeaders(userInfo) {
-    dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
+  static setOptionsHeaders(userInfo, status) {
+    if (status) {
+      dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
+    }
     dio.options.headers['env'] = 'prod';
     dio.options.headers['app-key'] = 'android64';
     dio.options.headers['x-bili-aurora-eid'] = 'UlMFQVcABlAH';
@@ -92,20 +97,43 @@ class Request {
       //响应流上前后两次接受到数据的间隔，单位为毫秒。
       receiveTimeout: const Duration(milliseconds: 12000),
       //Http请求头.
-      headers: {
-        // 'cookie': '',
-      },
+      headers: {},
     );
 
+    enableSystemProxy =
+        setting.get(SettingBoxKey.enableSystemProxy, defaultValue: false);
+    systemProxyHost =
+        localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
+    systemProxyPort =
+        localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');
+
     dio = Dio(options)
+
+      /// fix 第三方登录 302重定向 跟iOS代理问题冲突
       ..httpClientAdapter = Http2Adapter(
         ConnectionManager(
           idleTimeout: const Duration(milliseconds: 10000),
-          // Ignore bad certificate
           onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
         ),
       );
 
+    /// 设置代理
+    if (enableSystemProxy) {
+      dio.httpClientAdapter = IOHttpClientAdapter(
+        createHttpClient: () {
+          final client = HttpClient();
+          // Config the client.
+          client.findProxy = (uri) {
+            // return 'PROXY host:port';
+            return 'PROXY $systemProxyHost:$systemProxyPort';
+          };
+          client.badCertificateCallback =
+              (X509Certificate cert, String host, int port) => true;
+          return client;
+        },
+      );
+    }
+
     //添加拦截器
     dio.interceptors.add(ApiInterceptor());
 
@@ -118,30 +146,26 @@ class Request {
 
     dio.transformer = BackgroundTransformer();
     dio.options.validateStatus = (status) {
-      return status! >= 200 && status < 300 || status == 304 || status == 302;
+      return status! >= 200 && status < 300 ||
+          HttpString.validateStatusCodes.contains(status);
     };
   }
 
   /*
    * get请求
    */
-  get(url, {data, cacheOptions, options, cancelToken, extra}) async {
+  get(url, {data, options, cancelToken, extra}) async {
     Response response;
-    Options options;
-    String ua = 'pc';
+    Options options = Options();
     ResponseType resType = ResponseType.json;
     if (extra != null) {
-      ua = extra!['ua'] ?? 'pc';
       resType = extra!['resType'] ?? ResponseType.json;
+      if (extra['ua'] != null) {
+        options.headers = {'user-agent': headerUa(type: extra['ua'])};
+      }
     }
-    if (cacheOptions != null) {
-      cacheOptions.headers = {'user-agent': headerUa(ua)};
-      options = cacheOptions;
-    } else {
-      options = Options();
-      options.headers = {'user-agent': headerUa(ua)};
-      options.responseType = resType;
-    }
+    options.responseType = resType;
+
     try {
       response = await dio.get(
         url,
@@ -208,15 +232,19 @@ class Request {
     token.cancel("cancelled");
   }
 
-  String headerUa(ua) {
+  String headerUa({type = 'mob'}) {
     String headerUa = '';
-    if (ua == 'mob') {
-      headerUa = Platform.isIOS
-          ? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'
-          : 'Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.91 Mobile Safari/537.36';
+    if (type == 'mob') {
+      if (Platform.isIOS) {
+        headerUa =
+            'Mozilla/5.0 (iPhone; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1 Mobile/15E148 Safari/604.1';
+      } else {
+        headerUa =
+            'Mozilla/5.0 (Linux; Android 10; SM-G975F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.101 Mobile Safari/537.36';
+      }
     } else {
       headerUa =
-          'Mozilla/5.0 (MaciMozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36';
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.2 Safari/605.1.15';
     }
     return headerUa;
   }

lib/http/interceptor.dart

@@ -46,7 +46,10 @@ class ApiInterceptor extends Interceptor {
   void onError(DioException err, ErrorInterceptorHandler handler) async {
     // 处理网络请求错误
     // handler.next(err);
-    SmartDialog.showToast(await dioError(err));
+    SmartDialog.showToast(
+      await dioError(err),
+      displayType: SmartToastType.onlyRefresh,
+    );
     super.onError(err, handler);
   }
 

lib/http/login.dart

@@ -0,0 +1,177 @@
+import 'dart:convert';
+import 'dart:math';
+import 'package:crypto/crypto.dart';
+
+import 'package:dio/dio.dart';
+import 'package:encrypt/encrypt.dart';
+import 'package:pilipala/http/index.dart';
+import 'package:pilipala/models/login/index.dart';
+import 'package:pilipala/utils/login.dart';
+import 'package:uuid/uuid.dart';
+
+class LoginHttp {
+  static Future queryCaptcha() async {
+    var res = await Request().get(Api.getCaptcha);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': CaptchaDataModel.fromJson(res.data['data']),
+      };
+    } else {
+      return {'status': false, 'data': res.message};
+    }
+  }
+
+  static Future sendSmsCode({
+    int? cid,
+    required int tel,
+    required String token,
+    required String challenge,
+    required String validate,
+    required String seccode,
+  }) async {
+    var res = await Request().post(
+      Api.appSmsCode,
+      data: {
+        'cid': cid,
+        'tel': tel,
+        "source": "main_web",
+        'token': token,
+        'challenge': challenge,
+        'validate': validate,
+        'seccode': seccode,
+      },
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+        // headers: {'user-agent': ApiConstants.userAgent}
+      ),
+    );
+    print(res);
+  }
+
+  // web端验证码
+  static Future sendWebSmsCode({
+    int? cid,
+    required int tel,
+    required String token,
+    required String challenge,
+    required String validate,
+    required String seccode,
+  }) async {
+    Map data = {
+      'cid': cid,
+      'tel': tel,
+      'token': token,
+      'challenge': challenge,
+      'validate': validate,
+      'seccode': seccode,
+    };
+    FormData formData = FormData.fromMap({...data});
+    var res = await Request().post(
+      Api.smsCode,
+      data: formData,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    print(res);
+  }
+
+  // web端验证码登录
+  static Future loginInByWebSmsCode() async {}
+
+  // web端密码登录
+  static Future liginInByWebPwd() async {}
+
+  // app端验证码
+  static Future sendAppSmsCode({
+    int? cid,
+    required int tel,
+    required String token,
+    required String challenge,
+    required String validate,
+    required String seccode,
+  }) async {
+    Map<String, dynamic> data = {
+      'cid': cid,
+      'tel': tel,
+      'login_session_id': const Uuid().v4().replaceAll('-', ''),
+      'recaptcha_token': token,
+      'gee_challenge': challenge,
+      'gee_validate': validate,
+      'gee_seccode': seccode,
+      'channel': 'bili',
+      'buvid': buvid(),
+      'local_id': buvid(),
+      // 'ts': DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      'statistics': {
+        "appId": 1,
+        "platform": 3,
+        "version": "7.52.0",
+        "abtest": ""
+      },
+    };
+    // FormData formData = FormData.fromMap({...data});
+    var res = await Request().post(
+      Api.appSmsCode,
+      data: data,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    print(res);
+  }
+
+  static String buvid() {
+    var mac = <String>[];
+    var random = Random();
+
+    for (var i = 0; i < 6; i++) {
+      var min = 0;
+      var max = 0xff;
+      var num = (random.nextInt(max - min + 1) + min).toRadixString(16);
+      mac.add(num);
+    }
+
+    var md5Str = md5.convert(utf8.encode(mac.join(':'))).toString();
+    var md5Arr = md5Str.split('');
+    return 'XY${md5Arr[2]}${md5Arr[12]}${md5Arr[22]}$md5Str';
+  }
+
+  // 获取盐hash跟PubKey
+  static Future getWebKey() async {
+    var res = await Request().get(Api.getWebKey,
+        data: {'disable_rcmd': 0, 'local_id': LoginUtils.generateBuvid()});
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'data': {}, 'msg': res.data['message']};
+    }
+  }
+
+  // app端密码登录
+  static Future loginInByMobPwd({
+    required String tel,
+    required String password,
+    required String key,
+    required String rhash,
+  }) async {
+    dynamic publicKey = RSAKeyParser().parse(key);
+    String passwordEncryptyed =
+        Encrypter(RSA(publicKey: publicKey)).encrypt(rhash + password).base64;
+    Map<String, dynamic> data = {
+      'username': tel,
+      'password': passwordEncryptyed,
+      'local_id': LoginUtils.generateBuvid(),
+      'disable_rcmd': "0",
+    };
+    var res = await Request().post(
+      Api.loginInByPwdApi,
+      data: data,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    print(res);
+  }
+}

lib/http/member.dart

@@ -1,7 +1,16 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/dynamics/result.dart';
+import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/models/member/archive.dart';
+import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/models/member/info.dart';
+import 'package:pilipala/models/member/seasons.dart';
+import 'package:pilipala/models/member/tags.dart';
+import 'package:pilipala/utils/storage.dart';
+import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/wbi_sign.dart';
 
 class MemberHttp {
@@ -18,6 +27,7 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberInfo,
       data: params,
+      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -65,7 +75,7 @@ class MemberHttp {
     int ps = 30,
     int tid = 0,
     int? pn,
-    String keyword = '',
+    String? keyword,
     String order = 'pubdate',
     bool orderAvoided = true,
   }) async {
@@ -74,7 +84,7 @@ class MemberHttp {
       'ps': ps,
       'tid': tid,
       'pn': pn,
-      'keyword': keyword,
+      'keyword': keyword ?? '',
       'order': order,
       'platform': 'web',
       'web_location': 1550101,
@@ -83,6 +93,7 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberArchive,
       data: params,
+      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -119,4 +130,335 @@ class MemberHttp {
       };
     }
   }
+
+  // 搜索用户动态
+  static Future memberDynamicSearch({int? pn, int? ps, int? mid}) async {
+    var res = await Request().get(Api.memberDynamic, data: {
+      'keyword': '海拔',
+      'mid': mid,
+      'pn': pn,
+      'ps': ps,
+      'platform': 'web'
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': DynamicsDataModel.fromJson(res.data['data']),
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 查询分组
+  static Future followUpTags() async {
+    var res = await Request().get(Api.followUpTag);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 设置分组
+  static Future addUsers(int? fids, String? tagids) async {
+    var res = await Request().post(Api.addUsers, queryParameters: {
+      'fids': fids,
+      'tagids': tagids ?? '0',
+      'csrf': await Request.getCsrf(),
+    }, data: {
+      'cross_domain': true
+    });
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': [], 'msg': '操作成功'};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取某分组下的up
+  static Future followUpGroup(
+    int? mid,
+    int? tagid,
+    int? pn,
+    int? ps,
+  ) async {
+    var res = await Request().get(Api.followUpGroup, data: {
+      'mid': mid,
+      'tagid': tagid,
+      'pn': pn,
+      'ps': ps,
+    });
+    if (res.data['code'] == 0) {
+      // FollowItemModel
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取up置顶
+  static Future getTopVideo(String? vmid) async {
+    var res = await Request().get(Api.getTopVideoApi);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取uo专栏
+  static Future getMemberSeasons(int? mid, int? pn, int? ps) async {
+    var res = await Request().get(Api.getMemberSeasonsApi, data: {
+      'mid': mid,
+      'page_num': pn,
+      'page_size': ps,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 最近投币
+  static Future getRecentCoinVideo({required int mid}) async {
+    Map params = await WbiSign().makSign({
+      'mid': mid,
+      'gaia_source': 'main_web',
+      'web_location': 333.999,
+    });
+    var res = await Request().get(
+      Api.getRecentCoinVideoApi,
+      data: {
+        'vmid': mid,
+        'gaia_source': 'main_web',
+        'web_location': 333.999,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberCoinsDataModel>((e) => MemberCoinsDataModel.fromJson(e))
+            .toList(),
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 最近点赞
+  static Future getRecentLikeVideo({required int mid}) async {
+    Map params = await WbiSign().makSign({
+      'mid': mid,
+      'gaia_source': 'main_web',
+      'web_location': 333.999,
+    });
+    var res = await Request().get(
+      Api.getRecentLikeVideoApi,
+      data: {
+        'vmid': mid,
+        'gaia_source': 'main_web',
+        'web_location': 333.999,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 查看某个专栏
+  static Future getSeasonDetail({
+    required int mid,
+    required int seasonId,
+    bool sortReverse = false,
+    required int pn,
+    required int ps,
+  }) async {
+    var res = await Request().get(
+      Api.getSeasonDetailApi,
+      data: {
+        'mid': mid,
+        'season_id': seasonId,
+        'sort_reverse': sortReverse,
+        'page_num': pn,
+        'page_size': ps,
+      },
+    );
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': MemberSeasonsList.fromJson(res.data['data'])
+        };
+      } catch (err) {
+        print(err);
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取TV authCode
+  static Future getTVCode() async {
+    SmartDialog.showLoading();
+    var params = {
+      'appkey': Constants.appKey,
+      'local_id': '0',
+      'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(),
+    };
+    String sign = Utils.appSign(
+      params,
+      Constants.appKey,
+      Constants.appSec,
+    );
+    var res = await Request()
+        .post(Api.getTVCode, queryParameters: {...params, 'sign': sign});
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']['auth_code'],
+        'msg': '操作成功'
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取access_key
+  static Future cookieToKey() async {
+    var authCodeRes = await getTVCode();
+    if (authCodeRes['status']) {
+      var res = await Request().post(Api.cookieToKey, queryParameters: {
+        'auth_code': authCodeRes['data'],
+        'build': 708200,
+        'csrf': await Request.getCsrf(),
+      });
+      await Future.delayed(const Duration(milliseconds: 300));
+      await qrcodePoll(authCodeRes['data']);
+      if (res.data['code'] == 0) {
+        return {'status': true, 'data': [], 'msg': '操作成功'};
+      } else {
+        return {
+          'status': false,
+          'data': [],
+          'msg': res.data['message'],
+        };
+      }
+    }
+  }
+
+  static Future qrcodePoll(authCode) async {
+    var params = {
+      'appkey': Constants.appKey,
+      'auth_code': authCode.toString(),
+      'local_id': '0',
+      'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(),
+    };
+    String sign = Utils.appSign(
+      params,
+      Constants.appKey,
+      Constants.appSec,
+    );
+    var res = await Request()
+        .post(Api.qrcodePoll, queryParameters: {...params, 'sign': sign});
+    SmartDialog.dismiss();
+    if (res.data['code'] == 0) {
+      String accessKey = res.data['data']['access_token'];
+      Box localCache = GStrorage.localCache;
+      Box userInfoCache = GStrorage.userInfo;
+      var userInfo = userInfoCache.get('userInfoCache');
+      localCache.put(
+          LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey});
+      return {'status': true, 'data': [], 'msg': '操作成功'};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取up播放数、点赞数
+  static Future memberView({required int mid}) async {
+    var res = await Request().get(Api.getMemberViewApi, data: {'mid': mid});
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/msg.dart

@@ -0,0 +1,89 @@
+import 'package:pilipala/http/api.dart';
+import 'package:pilipala/http/init.dart';
+import 'package:pilipala/models/msg/account.dart';
+import 'package:pilipala/models/msg/session.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
+
+class MsgHttp {
+  // 会话列表
+  static Future sessionList({int? endTs}) async {
+    Map<String, dynamic> params = {
+      'session_type': 1,
+      'group_fold': 1,
+      'unfollow_fold': 0,
+      'sort_rule': 2,
+      'build': 0,
+      'mobi_app': 'web',
+    };
+    if (endTs != null) {
+      params['end_ts'] = endTs;
+    }
+
+    Map signParams = await WbiSign().makSign(params);
+    var res = await Request().get(Api.sessionList, data: signParams);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': SessionDataModel.fromJson(res.data['data']),
+      };
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  static Future accountList(uids) async {
+    var res = await Request().get(Api.sessionAccountList, data: {
+      'uids': uids,
+      'build': 0,
+      'mobi_app': 'web',
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<AccountListModel>((e) => AccountListModel.fromJson(e))
+            .toList(),
+      };
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  static Future sessionMsg({
+    int? talkerId,
+  }) async {
+    Map params = await WbiSign().makSign({
+      'talker_id': talkerId,
+      'session_type': 1,
+      'size': 20,
+      'sender_device_id': 1,
+      'build': 0,
+      'mobi_app': 'web',
+    });
+    var res = await Request().get(Api.sessionMsg, data: params);
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': SessionMsgDataModel.fromJson(res.data['data']),
+        };
+      } catch (err) {
+        print(err);
+      }
+    } else {
+      return {
+        'status': false,
+        'date': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+}

lib/http/reply.dart

@@ -26,7 +26,7 @@ class ReplyHttp {
       Map errMap = {
         -400: '请求错误',
         -404: '无此项',
-        12002: '当前页面评论功能已关闭"',
+        12002: '当前页面评论功能已关闭',
         12009: '评论主体的type不合法',
         12061: 'UP主已关闭评论区',
       };

lib/http/search.dart

@@ -1,37 +1,63 @@
+import 'dart:convert';
+
+import 'package:hive/hive.dart';
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/search/hot.dart';
 import 'package:pilipala/models/search/result.dart';
 import 'package:pilipala/models/search/suggest.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class SearchHttp {
+  static Box setting = GStrorage.setting;
   static Future hotSearchList() async {
     var res = await Request().get(Api.hotSearchList);
-    if (res.data['code'] == 0) {
+    if (res.data is String) {
+      Map<String, dynamic> resultMap = json.decode(res.data);
+      if (resultMap['code'] == 0) {
+        return {
+          'status': true,
+          'data': HotSearchModel.fromJson(resultMap),
+        };
+      }
+    } else if (res.data is Map<String, dynamic> && res.data['code'] == 0) {
       return {
         'status': true,
         'data': HotSearchModel.fromJson(res.data),
       };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': '请求错误 🙅',
-      };
     }
+
+    return {
+      'status': false,
+      'data': [],
+      'msg': '请求错误 🙅',
+    };
   }
 
   // 获取搜索建议
   static Future searchSuggest({required term}) async {
     var res = await Request().get(Api.serachSuggest,
         data: {'term': term, 'main_ver': 'v1', 'highlight': term});
-    if (res.data['code'] == 0) {
-      res.data['result']['term'] = term;
-      return {
-        'status': true,
-        'data': SearchSuggestModel.fromJson(res.data['result']),
-      };
+    if (res.data is String) {
+      Map<String, dynamic> resultMap = json.decode(res.data);
+      if (resultMap['code'] == 0) {
+        if (resultMap['result'] is Map) {
+          resultMap['result']['term'] = term;
+        }
+        return {
+          'status': true,
+          'data': resultMap['result'] is Map
+              ? SearchSuggestModel.fromJson(resultMap['result'])
+              : [],
+        };
+      } else {
+        return {
+          'status': false,
+          'data': [],
+          'msg': '请求错误 🙅',
+        };
+      }
     } else {
       return {
         'status': false,
@@ -61,29 +87,44 @@ class SearchHttp {
     var res = await Request().get(Api.searchByType, data: reqData);
     if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
       Object data;
-      switch (searchType) {
-        case SearchType.video:
-          data = SearchVideoModel.fromJson(res.data['data']);
-          break;
-        case SearchType.live_room:
-          data = SearchLiveModel.fromJson(res.data['data']);
-          break;
-        case SearchType.bili_user:
-          data = SearchUserModel.fromJson(res.data['data']);
-          break;
-        case SearchType.media_bangumi:
-          data = SearchMBangumiModel.fromJson(res.data['data']);
-          break;
+      try {
+        switch (searchType) {
+          case SearchType.video:
+            List<int> blackMidsList =
+                setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
+            for (var i in res.data['data']['result']) {
+              // 屏蔽推广和拉黑用户
+              i['available'] = !blackMidsList.contains(i['mid']);
+            }
+            data = SearchVideoModel.fromJson(res.data['data']);
+            break;
+          case SearchType.live_room:
+            data = SearchLiveModel.fromJson(res.data['data']);
+            break;
+          case SearchType.bili_user:
+            data = SearchUserModel.fromJson(res.data['data']);
+            break;
+          case SearchType.media_bangumi:
+            data = SearchMBangumiModel.fromJson(res.data['data']);
+            break;
+          case SearchType.article:
+            data = SearchArticleModel.fromJson(res.data['data']);
+            break;
+        }
+        return {
+          'status': true,
+          'data': data,
+        };
+      } catch (err) {
+        print(err);
       }
-      return {
-        'status': true,
-        'data': data,
-      };
     } else {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['data']['numPages'] == 0 ? '没有相关数据' : '请求错误 🙅',
+        'msg': res.data['data'] != null && res.data['data']['numPages'] == 0
+            ? '没有相关数据'
+            : res.data['message'],
       };
     }
   }

lib/http/user.dart

@@ -8,6 +8,7 @@ import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/models/user/history.dart';
 import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/user/stat.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
 
 class UserHttp {
   static Future<dynamic> userStat({required int mid}) async {
@@ -70,14 +71,15 @@ class UserHttp {
       required int pn,
       required int ps,
       String keyword = '',
-      String order = 'mtime'}) async {
+      String order = 'mtime',
+      int type = 0}) async {
     var res = await Request().get(Api.userFavFolderDetail, data: {
       'media_id': mediaId,
       'pn': pn,
       'ps': ps,
       'keyword': keyword,
       'order': order,
-      'type': 0,
+      'type': type,
       'tid': 0,
       'platform': 'web'
     });
@@ -197,7 +199,7 @@ class UserHttp {
     }
   }
 
-  // 获取用户凭证
+  // 获取用户凭证 失效
   static Future thirdLogin() async {
     var res = await Request().get(
       'https://passport.bilibili.com/login/app/third',
@@ -231,4 +233,77 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  // 删除历史记录
+  static Future delHistory(kid) async {
+    var res = await Request().post(
+      Api.delHistory,
+      queryParameters: {
+        'kid': kid,
+        'jsonp': 'jsonp',
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'msg': '已删除'};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+
+  static Future hasFollow(int mid) async {
+    var res = await Request().get(
+      Api.hasFollow,
+      data: {
+        'fid': mid,
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
+  // // 相互关系查询
+  // static Future relationSearch(int mid) async {
+  //   Map params = await WbiSign().makSign({
+  //     'mid': mid,
+  //     'token': '',
+  //     'platform': 'web',
+  //     'web_location': 1550101,
+  //   });
+  //   var res = await Request().get(
+  //     Api.relationSearch,
+  //     data: {
+  //       'mid': mid,
+  //       'w_rid': params['w_rid'],
+  //       'wts': params['wts'],
+  //     },
+  //   );
+  //   if (res.data['code'] == 0) {
+  //     // relation 主动状态
+  //     // 被动状态
+  //     return {'status': true, 'data': res.data['data']};
+  //   } else {
+  //     return {'status': false, 'msg': res.data['message']};
+  //   }
+  // }
+
+  // 搜索历史记录
+  static Future searchHistory(
+      {required int pn, required String keyword}) async {
+    var res = await Request().get(
+      Api.searchHistory,
+      data: {
+        'pn': pn,
+        'keyword': keyword,
+        'business': 'all',
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': HistoryData.fromJson(res.data['data'])};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }

lib/http/video.dart

@@ -9,9 +9,11 @@ import 'package:pilipala/models/home/rcmd/result.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
 import 'package:pilipala/models/model_rec_video_item.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/models/video/ai.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
 
 /// res.data['code'] == 0 请求正常返回结果
 /// res.data['data'] 为结果
@@ -20,6 +22,9 @@ import 'package:pilipala/utils/storage.dart';
 class VideoHttp {
   static Box localCache = GStrorage.localCache;
   static Box setting = GStrorage.setting;
+  static bool enableRcmdDynamic =
+      setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true);
+  static Box userInfoCache = GStrorage.userInfo;
 
   // 首页推荐视频
   static Future rcmdVideoList({required int ps, required int freshIdx}) async {
@@ -73,6 +78,7 @@ class VideoHttp {
         for (var i in res.data['data']['items']) {
           // 屏蔽推广和拉黑用户
           if (i['card_goto'] != 'ad_av' &&
+              (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
               (i['args'] != null &&
                   !blackMidsList.contains(i['args']['up_mid']))) {
             list.add(RecVideoItemAppModel.fromJson(i));
@@ -130,6 +136,11 @@ class VideoHttp {
       // 'platform': '',
       // 'high_quality': ''
     };
+    // 免登录查看1080p
+    if (userInfoCache.get('userInfoCache') == null &&
+        setting.get(SettingBoxKey.p1080, defaultValue: true)) {
+      data['try_look'] = 1;
+    }
     try {
       var res = await Request().get(Api.videoUrl, data: data);
       if (res.data['code'] == 0) {
@@ -411,4 +422,23 @@ class VideoHttp {
       return {'status': true, 'data': res.data['data']};
     }
   }
+
+  static Future aiConclusion({
+    String? bvid,
+    int? cid,
+    int? upMid,
+  }) async {
+    Map params = await WbiSign().makSign({
+      'bvid': bvid,
+      'cid': cid,
+      'up_mid': upMid,
+    });
+    var res = await Request().get(Api.aiConclusion, data: params);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': AiConclusionModel.fromJson(res.data['data']),
+      };
+    }
+  }
 }

lib/main.dart

@@ -1,4 +1,7 @@
+import 'dart:io';
+
 import 'package:flutter/services.dart';
+import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -13,6 +16,7 @@ import 'package:pilipala/pages/search/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/router/app_pages.dart';
 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/storage.dart';
@@ -25,6 +29,7 @@ void main() async {
           [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
       .then((_) async {
     await GStrorage.init();
+    await setupServiceLocator();
     runApp(const MyApp());
     // 小白条、导航栏沉浸
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
@@ -61,6 +66,23 @@ class MyApp extends StatelessWidget {
     double textScale =
         setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
 
+    // 强制设置高帧率
+    if (Platform.isAndroid) {
+      try {
+        late List modes;
+        FlutterDisplayMode.supported.then((value) {
+          modes = value;
+          var storageDisplay = setting.get(SettingBoxKey.displayMode);
+          DisplayMode f = DisplayMode.auto;
+          if (storageDisplay != null) {
+            f = modes.firstWhere((e) => e.toString() == storageDisplay);
+          }
+          DisplayMode preferred = modes.toList().firstWhere((el) => el == f);
+          FlutterDisplayMode.setPreferredMode(preferred);
+        });
+      } catch (_) {}
+    }
+
     return DynamicColorBuilder(
       builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
         ColorScheme? lightColorScheme;

lib/models/common/search_type.dart

@@ -12,20 +12,20 @@ enum SearchType {
   live_room,
   // 主播：live_user
   // live_user,
-  // 专栏：article
-  // article,
   // 话题：topic
   // topic,
   // 用户：bili_user
   bili_user,
+  // 专栏：article
+  article,
   // 相簿：photo
   // photo
 }
 
 extension SearchTypeExtension on SearchType {
   String get type =>
-      ['video', 'media_bangumi', 'live_room', 'bili_user'][index];
-  String get label => ['视频', '番剧', '直播间', '用户'][index];
+      ['video', 'media_bangumi', 'live_room', 'bili_user', 'article'][index];
+  String get label => ['视频', '番剧', '直播间', '用户', '专栏'][index];
 }
 
 // 搜索类型为视频、专栏及相簿时

lib/models/dynamics/result.dart

@@ -244,7 +244,9 @@ class Vote {
     choiceCnt = json['choice_cnt'];
     share = json['share'];
     defaultShare = json['default_share'];
-    endTime = json['end_time'];
+    endTime = json['end_time'] is int
+        ? json['end_time']
+        : int.parse(json['end_time']);
     joinNum = json['join_num'];
     status = json['status'];
     type = json['type'];

lib/models/follow/result.dart

@@ -8,7 +8,7 @@ class FollowDataModel {
   List<FollowItemModel>? list;
 
   FollowDataModel.fromJson(Map<String, dynamic> json) {
-    total = json['total'];
+    total = json['total'] ?? 0;
     list = json['list']
         .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
         .toList();
@@ -19,7 +19,7 @@ class FollowItemModel {
   FollowItemModel({
     this.mid,
     this.attribute,
-    this.mtime,
+    // this.mtime,
     this.tag,
     this.special,
     this.uname,
@@ -30,7 +30,7 @@ class FollowItemModel {
 
   int? mid;
   int? attribute;
-  int? mtime;
+  // int? mtime;
   List? tag;
   int? special;
   String? uname;
@@ -41,7 +41,7 @@ class FollowItemModel {
   FollowItemModel.fromJson(Map<String, dynamic> json) {
     mid = json['mid'];
     attribute = json['attribute'];
-    mtime = json['mtime'];
+    // mtime = json['mtime'];
     tag = json['tag'];
     special = json['special'];
     uname = json['uname'];

lib/models/home/rcmd/result.dart

@@ -118,7 +118,7 @@ class RcmdStat {
 
   RcmdStat.fromJson(Map<String, dynamic> json) {
     view = json["cover_left_text_1"];
-    danmu = json['cover_left_text_2'];
+    danmu = json['cover_left_text_2'] ?? '-';
   }
 }
 

lib/models/login/index.dart

@@ -0,0 +1,49 @@
+class CaptchaDataModel {
+  CaptchaDataModel({
+    this.type,
+    this.token,
+    this.geetest,
+    this.tencent,
+    this.validate,
+    this.seccode,
+  });
+
+  String? type;
+  String? token;
+  GeetestData? geetest;
+  Tencent? tencent;
+  String? validate;
+  String? seccode;
+
+  CaptchaDataModel.fromJson(Map<String, dynamic> json) {
+    type = json["type"];
+    token = json["token"];
+    geetest =
+        json["geetest"] != null ? GeetestData.fromJson(json["geetest"]) : null;
+    tencent =
+        json["tencent"] != null ? Tencent.fromJson(json["tencent"]) : null;
+  }
+}
+
+class GeetestData {
+  GeetestData({
+    this.challenge,
+    this.gt,
+  });
+
+  String? challenge;
+  String? gt;
+
+  GeetestData.fromJson(Map<String, dynamic> json) {
+    challenge = json["challenge"];
+    gt = json["gt"];
+  }
+}
+
+class Tencent {
+  Tencent({this.appid});
+  String? appid;
+  Tencent.fromJson(Map<String, dynamic> json) {
+    appid = json["appid"];
+  }
+}

lib/models/member/coin.dart

@@ -0,0 +1,89 @@
+class MemberCoinsDataModel {
+  MemberCoinsDataModel({
+    this.aid,
+    this.bvid,
+    this.cid,
+    this.coins,
+    this.copyright,
+    this.ctime,
+    this.desc,
+    this.duration,
+    this.owner,
+    this.pic,
+    this.pubLocation,
+    this.pubdate,
+    this.resourceType,
+    this.state,
+    this.subtitle,
+    this.time,
+    this.title,
+    this.tname,
+    this.videos,
+    this.view,
+    this.danmaku,
+  });
+
+  int? aid;
+  String? bvid;
+  int? cid;
+  int? coins;
+  int? copyright;
+  int? ctime;
+  String? desc;
+  int? duration;
+  Owner? owner;
+  String? pic;
+  String? pubLocation;
+  int? pubdate;
+  String? resourceType;
+  int? state;
+  String? subtitle;
+  int? time;
+  String? title;
+  String? tname;
+  int? videos;
+  int? view;
+  int? danmaku;
+
+  MemberCoinsDataModel.fromJson(Map<String, dynamic> json) {
+    aid = json['aid'];
+    bvid = json['bvid'];
+    cid = json['cid'];
+    coins = json['coins'];
+    copyright = json['copyright'];
+    ctime = json['ctime'];
+    desc = json['desc'];
+    duration = json['duration'];
+    owner = Owner.fromJson(json['owner']);
+    pic = json['pic'];
+    pubLocation = json['pub_location'];
+    pubdate = json['pubdate'];
+    resourceType = json['resource_type'];
+    state = json['state'];
+    subtitle = json['subtitle'];
+    time = json['time'];
+    title = json['title'];
+    tname = json['tname'];
+    videos = json['videos'];
+    view = json['stat']['view'];
+    danmaku = json['stat']['danmaku'];
+  }
+}
+
+class Owner {
+  Owner({
+    this.mid,
+    this.name,
+    this.face,
+  });
+
+  int? mid;
+  String? name;
+  String? face;
+
+  Owner.fromJson(Map<String, dynamic> json) {
+    mid = json['mid'];
+    name = json['name'];
+    face = json['face'];
+  }
+}

lib/models/member/seasons.dart

@@ -0,0 +1,108 @@
+class MemberSeasonsDataModel {
+  MemberSeasonsDataModel({
+    this.page,
+    this.seasonsList,
+  });
+
+  Map? page;
+  List<MemberSeasonsList>? seasonsList;
+
+  MemberSeasonsDataModel.fromJson(Map<String, dynamic> json) {
+    page = json['page'];
+    seasonsList = json['seasons_list'] != null
+        ? json['seasons_list']
+            .map<MemberSeasonsList>((e) => MemberSeasonsList.fromJson(e))
+            .toList()
+        : [];
+  }
+}
+
+class MemberSeasonsList {
+  MemberSeasonsList({
+    this.archives,
+    this.meta,
+    this.recentAids,
+    this.page,
+  });
+
+  List<MemberArchiveItem>? archives;
+  MamberMeta? meta;
+  List? recentAids;
+  Map? page;
+
+  MemberSeasonsList.fromJson(Map<String, dynamic> json) {
+    archives = json['archives'] != null
+        ? json['archives']
+            .map<MemberArchiveItem>((e) => MemberArchiveItem.fromJson(e))
+            .toList()
+        : [];
+    meta = MamberMeta.fromJson(json['meta']);
+    page = json['page'];
+  }
+}
+
+class MemberArchiveItem {
+  MemberArchiveItem({
+    this.aid,
+    this.bvid,
+    this.ctime,
+    this.duration,
+    this.pic,
+    this.cover,
+    this.pubdate,
+    this.view,
+    this.title,
+  });
+
+  int? aid;
+  String? bvid;
+  int? ctime;
+  int? duration;
+  String? pic;
+  String? cover;
+  int? pubdate;
+  int? view;
+  String? title;
+
+  MemberArchiveItem.fromJson(Map<String, dynamic> json) {
+    aid = json['aid'];
+    bvid = json['bvid'];
+    ctime = json['ctime'];
+    duration = json['duration'];
+    pic = json['pic'];
+    cover = json['pic'];
+    pubdate = json['pubdate'];
+    view = json['stat']['view'];
+    title = json['title'];
+  }
+}
+
+class MamberMeta {
+  MamberMeta({
+    this.cover,
+    this.description,
+    this.mid,
+    this.name,
+    this.ptime,
+    this.seasonId,
+    this.total,
+  });
+
+  String? cover;
+  String? description;
+  int? mid;
+  String? name;
+  int? ptime;
+  int? seasonId;
+  int? total;
+
+  MamberMeta.fromJson(Map<String, dynamic> json) {
+    cover = json['cover'];
+    description = json['description'];
+    mid = json['mid'];
+    name = json['name'];
+    ptime = json['ptime'];
+    seasonId = json['season_id'];
+    total = json['total'];
+  }
+}

lib/models/member/tags.dart

@@ -0,0 +1,23 @@
+class MemberTagItemModel {
+  MemberTagItemModel({
+    this.count,
+    this.name,
+    this.tagid,
+    this.tip,
+    this.checked,
+  });
+
+  int? count;
+  String? name;
+  int? tagid;
+  String? tip;
+  bool? checked;
+
+  MemberTagItemModel.fromJson(Map<String, dynamic> json) {
+    count = json['count'];
+    name = json['name'];
+    tagid = json['tagid'];
+    tip = json['tip'];
+    checked = false;
+  }
+}

lib/models/model_rec_video_item.dart

@@ -36,7 +36,7 @@ class RecVideoItemModel {
   @HiveField(6)
   String? title = '';
   @HiveField(7)
-  int? duration = -1;
+  String? duration = '';
   @HiveField(8)
   int? pubdate = -1;
   @HiveField(9)
@@ -56,7 +56,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = json["duration"];
+    duration = json["duration"].toString();
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
@@ -72,19 +72,19 @@ class Stat {
   Stat({
     this.view,
     this.like,
-    this.danmaku,
+    this.danmu,
   });
   @HiveField(0)
   int? view;
   @HiveField(1)
   int? like;
   @HiveField(2)
-  int? danmaku;
+  int? danmu;
 
   Stat.fromJson(Map<String, dynamic> json) {
     view = json["view"];
     like = json["like"];
-    danmaku = json['danmaku'];
+    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?,
@@ -89,7 +89,7 @@ class StatAdapter extends TypeAdapter<Stat> {
     return Stat(
       view: fields[0] as int?,
       like: fields[1] as int?,
-      danmaku: fields[2] as int?,
+      danmu: fields[2] as int?,
     );
   }
 
@@ -102,7 +102,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       ..writeByte(1)
       ..write(obj.like)
       ..writeByte(2)
-      ..write(obj.danmaku);
+      ..write(obj.danmu);
   }
 
   @override

lib/models/msg/account.dart

@@ -0,0 +1,80 @@
+class AccountListModel {
+  AccountListModel({
+    this.mid,
+    this.name,
+    this.sex,
+    this.face,
+    this.sign,
+    this.rank,
+    this.level,
+    this.silence,
+    this.vip,
+    this.pendant,
+    this.nameplate,
+    this.official,
+    this.birthday,
+    this.isFakeAccount,
+    this.isDeleted,
+    this.inRegAudit,
+    this.faceNft,
+    this.faceNftNew,
+    this.isSeniorMember,
+    this.digitalId,
+    this.digitalType,
+    this.attestation,
+    this.expertInfo,
+    this.honours,
+  });
+
+  int? mid;
+  String? name;
+  String? sex;
+  String? face;
+  String? sign;
+  int? rank;
+  int? level;
+  int? silence;
+  Map? vip;
+  Map? pendant;
+  Map? nameplate;
+  Map? official;
+  int? birthday;
+  int? isFakeAccount;
+  int? isDeleted;
+  int? inRegAudit;
+  int? faceNft;
+  int? faceNftNew;
+  int? isSeniorMember;
+  String? digitalId;
+  int? digitalType;
+  Map? attestation;
+  Map? expertInfo;
+  Map? honours;
+
+  AccountListModel.fromJson(Map<String, dynamic> json) {
+    mid = json['mid'];
+    name = json['name'] ?? '';
+    sex = json['sex'];
+    face = json['face'];
+    sign = json['sign'];
+    rank = json['rank'];
+    level = json['level'];
+    silence = json['silence'];
+    vip = json['vip'];
+    pendant = json['pendant'];
+    nameplate = json['nameplate'];
+    official = json['official'];
+    birthday = json['birthday'];
+    isFakeAccount = json['is_fake_account'];
+    isDeleted = json['is_deleted'];
+    inRegAudit = json['in_reg_audit'];
+    faceNft = json['face_nft'];
+    faceNftNew = json['face_nft_new'];
+    isSeniorMember = json['is_senior_member'];
+    digitalId = json['digital_id'];
+    digitalType = json['digital_type'];
+    attestation = json['attestation'];
+    expertInfo = json['expert_info'];
+    honours = json['honours'];
+  }
+}

lib/models/msg/session.dart

@@ -0,0 +1,226 @@
+import 'dart:convert';
+
+import 'package:pilipala/models/msg/account.dart';
+
+class SessionDataModel {
+  SessionDataModel({
+    this.sessionList,
+    this.hasMore,
+  });
+
+  List? sessionList;
+  int? hasMore;
+
+  SessionDataModel.fromJson(Map<String, dynamic> json) {
+    sessionList = json['session_list']
+        ?.map<SessionList>((e) => SessionList.fromJson(e))
+        .toList();
+    hasMore = json['has_more'];
+  }
+}
+
+class SessionList {
+  SessionList({
+    this.talkerId,
+    this.sessionType,
+    this.atSeqno,
+    this.topTs,
+    this.groupName,
+    this.groupCover,
+    this.isFollow,
+    this.isDnd,
+    this.ackSeqno,
+    this.ackTs,
+    this.sessionTs,
+    this.unreadCount,
+    this.lastMsg,
+    this.groupType,
+    this.canFold,
+    this.status,
+    this.maxSeqno,
+    this.newPushMsg,
+    this.setting,
+    this.isGuardian,
+    this.isIntercept,
+    this.isTrust,
+    this.systemMsgType,
+    this.liveStatus,
+    this.bizMsgUnreadCount,
+    // this.userLabel,
+  });
+
+  int? talkerId;
+  int? sessionType;
+  int? atSeqno;
+  int? topTs;
+  String? groupName;
+  String? groupCover;
+  int? isFollow;
+  int? isDnd;
+  int? ackSeqno;
+  int? ackTs;
+  int? sessionTs;
+  int? unreadCount;
+  LastMsg? lastMsg;
+  int? groupType;
+  int? canFold;
+  int? status;
+  int? maxSeqno;
+  int? newPushMsg;
+  int? setting;
+  int? isGuardian;
+  int? isIntercept;
+  int? isTrust;
+  int? systemMsgType;
+  int? liveStatus;
+  int? bizMsgUnreadCount;
+  // int? userLabel;
+  AccountListModel? accountInfo;
+
+  SessionList.fromJson(Map<String, dynamic> json) {
+    talkerId = json["talker_id"];
+    sessionType = json["session_type"];
+    atSeqno = json["at_seqno"];
+    topTs = json["top_ts"];
+    groupName = json["group_name"];
+    groupCover = json["group_cover"];
+    isFollow = json["is_follow"];
+    isDnd = json["is_dnd"];
+    ackSeqno = json["ack_seqno"];
+    ackTs = json["ack_ts"];
+    sessionTs = json["session_ts"];
+    unreadCount = json["unread_count"];
+    lastMsg =
+        json["last_msg"] != null ? LastMsg.fromJson(json["last_msg"]) : null;
+    groupType = json["group_type"];
+    canFold = json["can_fold"];
+    status = json["status"];
+    maxSeqno = json["max_seqno"];
+    newPushMsg = json["new_push_msg"];
+    setting = json["setting"];
+    isGuardian = json["is_guardian"];
+    isIntercept = json["is_intercept"];
+    isTrust = json["is_trust"];
+    systemMsgType = json["system_msg_type"];
+    liveStatus = json["live_status"];
+    bizMsgUnreadCount = json["biz_msg_unread_count"];
+    // userLabel = json["user_label"];
+  }
+}
+
+class LastMsg {
+  LastMsg({
+    this.senderIid,
+    this.receiverType,
+    this.receiverId,
+    this.msgType,
+    this.content,
+    this.msgSeqno,
+    this.timestamp,
+    this.atUids,
+    this.msgKey,
+    this.msgStatus,
+    this.notifyCode,
+    this.newFaceVersion,
+  });
+
+  int? senderIid;
+  int? receiverType;
+  int? receiverId;
+  int? msgType;
+  Map? content;
+  int? msgSeqno;
+  int? timestamp;
+  String? atUids;
+  int? msgKey;
+  int? msgStatus;
+  String? notifyCode;
+  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 = 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'];
+  }
+}
+
+class SessionMsgDataModel {
+  SessionMsgDataModel({
+    this.messages,
+    this.hasMore,
+    this.minSeqno,
+    this.maxSeqno,
+    this.eInfos,
+  });
+
+  List<MessageItem>? messages;
+  int? hasMore;
+  int? minSeqno;
+  int? maxSeqno;
+  List? eInfos;
+
+  SessionMsgDataModel.fromJson(Map<String, dynamic> json) {
+    messages = json['messages']
+        .map<MessageItem>((e) => MessageItem.fromJson(e))
+        .toList();
+    hasMore = json['has_more'];
+    minSeqno = json['min_seqno'];
+    maxSeqno = json['max_seqno'];
+    eInfos = json['e_infos'];
+  }
+}
+
+class MessageItem {
+  MessageItem({
+    this.senderUid,
+    this.receiverType,
+    this.receiverId,
+    this.msgType,
+    this.content,
+    this.msgSeqno,
+    this.timestamp,
+    this.atUids,
+    this.msgKey,
+    this.msgStatus,
+    this.notifyCode,
+    this.newFaceVersion,
+  });
+
+  int? senderUid;
+  int? receiverType;
+  int? receiverId;
+  int? msgType;
+  dynamic content;
+  int? msgSeqno;
+  int? timestamp;
+  List? atUids;
+  int? msgKey;
+  int? msgStatus;
+  String? notifyCode;
+  int? newFaceVersion;
+
+  MessageItem.fromJson(Map<String, dynamic> json) {
+    senderUid = json['sender_uid'];
+    receiverType = json['receiver_type'];
+    receiverId = json['receiver_id'];
+    // 1 文本 2 图片 18 系统提示 10 系统通知  5 撤回的消息
+    msgType = json['msg_type'];
+    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'];
+  }
+}

lib/models/search/result.dart

@@ -6,6 +6,7 @@ class SearchVideoModel {
   List<SearchVideoItemModel>? list;
   SearchVideoModel.fromJson(Map<String, dynamic> json) {
     list = json['result']
+        .where((e) => e['available'] == true)
         .map<SearchVideoItemModel>((e) => SearchVideoItemModel.fromJson(e))
         .toList();
   }
@@ -17,7 +18,7 @@ class SearchVideoItemModel {
     this.id,
     this.cid,
     // this.author,
-    // this.mid,
+    this.mid,
     // this.typeid,
     // this.typename,
     this.arcurl,
@@ -47,7 +48,7 @@ class SearchVideoItemModel {
   int? id;
   int? cid;
   // String? author;
-  // String? mid;
+  int? mid;
   // String? typeid;
   // String? typename;
   String? arcurl;
@@ -80,6 +81,7 @@ class SearchVideoItemModel {
     arcurl = json['arcurl'];
     aid = json['aid'];
     bvid = json['bvid'];
+    mid = json['mid'];
     // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
     title = Em.regTitle(json['title']);
     description = json['description'];
@@ -376,3 +378,75 @@ class SearchMBangumiItemModel {
     indexShow = json['index_show'];
   }
 }
+
+class SearchArticleModel {
+  SearchArticleModel({this.list});
+
+  List<SearchArticleItemModel>? list;
+
+  SearchArticleModel.fromJson(Map<String, dynamic> json) {
+    list = json['result'] != null
+        ? json['result']
+            .map<SearchArticleItemModel>(
+                (e) => SearchArticleItemModel.fromJson(e))
+            .toList()
+        : [];
+  }
+}
+
+class SearchArticleItemModel {
+  SearchArticleItemModel({
+    this.pubTime,
+    this.like,
+    this.title,
+    this.subTitle,
+    this.rankOffset,
+    this.mid,
+    this.imageUrls,
+    this.id,
+    this.categoryId,
+    this.view,
+    this.reply,
+    this.desc,
+    this.rankScore,
+    this.type,
+    this.templateId,
+    this.categoryName,
+  });
+
+  int? pubTime;
+  int? like;
+  List? title;
+  String? subTitle;
+  int? rankOffset;
+  int? mid;
+  List? imageUrls;
+  int? id;
+  int? categoryId;
+  int? view;
+  int? reply;
+  String? desc;
+  int? rankScore;
+  String? type;
+  int? templateId;
+  String? categoryName;
+
+  SearchArticleItemModel.fromJson(Map<String, dynamic> json) {
+    pubTime = json['pub_time'];
+    like = json['like'];
+    title = Em.regTitle(json['title']);
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
+    rankOffset = json['rank_offset'];
+    mid = json['mid'];
+    imageUrls = json['image_urls'];
+    id = json['id'];
+    categoryId = json['category_id'];
+    view = json['view'];
+    reply = json['reply'];
+    desc = json['desc'];
+    rankScore = json['rank_score'];
+    type = json['type'];
+    templateId = json['templateId'];
+    categoryName = json['category_name'];
+  }
+}

lib/models/user/history.dart

@@ -3,17 +3,23 @@ class HistoryData {
     this.cursor,
     this.tab,
     this.list,
+    this.page,
   });
 
   Cursor? cursor;
   List<HisTabItem>? tab;
   List<HisListItem>? list;
+  Map? page;
 
   HistoryData.fromJson(Map<String, dynamic> json) {
-    cursor = Cursor.fromJson(json['cursor']);
-    tab = json['tab'].map<HisTabItem>((e) => HisTabItem.fromJson(e)).toList();
-    list =
-        json['list'].map<HisListItem>((e) => HisListItem.fromJson(e)).toList();
+    cursor = json['cursor'] != null ? Cursor.fromJson(json['cursor']) : null;
+    tab = json['tab'] != null
+        ? json['tab'].map<HisTabItem>((e) => HisTabItem.fromJson(e)).toList()
+        : [];
+    list = json['list'] != null
+        ? json['list'].map<HisListItem>((e) => HisListItem.fromJson(e)).toList()
+        : [];
+    page = json['page'];
   }
 }
 
@@ -79,6 +85,7 @@ class HisListItem {
     this.kid,
     this.tagName,
     this.liveStatus,
+    this.checked,
   });
 
   String? title;
@@ -105,6 +112,7 @@ class HisListItem {
   int? kid;
   String? tagName;
   int? liveStatus;
+  bool? checked;
 
   HisListItem.fromJson(Map<String, dynamic> json) {
     title = json['title'];
@@ -131,6 +139,7 @@ class HisListItem {
     kid = json['kid'];
     tagName = json['tag_name'];
     liveStatus = json['live_status'];
+    checked = false;
   }
 }
 

lib/models/video/ai.dart

@@ -0,0 +1,80 @@
+class AiConclusionModel {
+  AiConclusionModel({
+    this.code,
+    this.modelResult,
+    this.stid,
+    this.status,
+    this.likeNum,
+    this.dislikeNum,
+  });
+
+  int? code;
+  ModelResult? modelResult;
+  String? stid;
+  int? status;
+  int? likeNum;
+  int? dislikeNum;
+
+  AiConclusionModel.fromJson(Map<String, dynamic> json) {
+    code = json['code'];
+    modelResult = ModelResult.fromJson(json['model_result']);
+    stid = json['stid'];
+    status = json['status'];
+    likeNum = json['like_num'];
+    dislikeNum = json['dislike_num'];
+  }
+}
+
+class ModelResult {
+  ModelResult({
+    this.resultType,
+    this.summary,
+    this.outline,
+  });
+
+  int? resultType;
+  String? summary;
+  List<OutlineItem>? outline;
+
+  ModelResult.fromJson(Map<String, dynamic> json) {
+    resultType = json['result_type'];
+    summary = json['summary'];
+    outline = json['result_type'] == 2
+        ? json['outline']
+            .map<OutlineItem>((e) => OutlineItem.fromJson(e))
+            .toList()
+        : <OutlineItem>[];
+  }
+}
+
+class OutlineItem {
+  OutlineItem({
+    this.title,
+    this.partOutline,
+  });
+
+  String? title;
+  List<PartOutline>? partOutline;
+
+  OutlineItem.fromJson(Map<String, dynamic> json) {
+    title = json['title'];
+    partOutline = json['part_outline']
+        .map<PartOutline>((e) => PartOutline.fromJson(e))
+        .toList();
+  }
+}
+
+class PartOutline {
+  PartOutline({
+    this.timestamp,
+    this.content,
+  });
+
+  int? timestamp;
+  String? content;
+
+  PartOutline.fromJson(Map<String, dynamic> json) {
+    timestamp = json['timestamp'];
+    content = json['content'];
+  }
+}

lib/models/video/play/url.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:pilipala/models/video/play/quality.dart';
 
 class PlayUrlModel {

lib/pages/about/index.dart

@@ -1,6 +1,3 @@
-import 'dart:io';
-
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -34,11 +31,6 @@ class _AboutPageState extends State<AboutPage> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Divider(
-              thickness: 8,
-              height: 10,
-              color: Theme.of(context).colorScheme.onInverseSurface,
-            ),
             Image.asset(
               'assets/images/logo/logo_android_2.png',
               width: 150,
@@ -83,9 +75,9 @@ class _AboutPageState extends State<AboutPage> {
             //   ),
             // ),
             Divider(
-              thickness: 8,
+              thickness: 1,
               height: 30,
-              color: Theme.of(context).colorScheme.onInverseSurface,
+              color: Theme.of(context).colorScheme.outlineVariant,
             ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
@@ -95,6 +87,17 @@ class _AboutPageState extends State<AboutPage> {
                 style: subTitleStyle,
               ),
             ),
+            ListTile(
+              onTap: () => _aboutController.panDownload(),
+              title: const Text('网盘下载'),
+              trailing: Text(
+                '提取码：pili',
+                style: TextStyle(
+                  fontSize: 13,
+                  color: Theme.of(context).colorScheme.outline,
+                ),
+              ),
+            ),
             ListTile(
               onTap: () => _aboutController.feedback(),
               title: const Text('问题反馈'),
@@ -123,11 +126,6 @@ class _AboutPageState extends State<AboutPage> {
               title: const Text('赞助'),
               trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
-            Divider(
-              thickness: 8,
-              height: 30,
-              color: Theme.of(context).colorScheme.onInverseSurface,
-            ),
           ],
         ),
       ),
@@ -173,7 +171,7 @@ class AboutController extends GetxController {
 
   // 获取远程版本
   Future getRemoteApp() async {
-    var result = await Request().get(Api.latestApp);
+    var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
     data = LatestDataModel.fromJson(result.data);
     remoteAppInfo = data;
     remoteVersion.value = data.tagName!;
@@ -195,6 +193,14 @@ class AboutController extends GetxController {
     );
   }
 
+  // 从网盘下载
+  panDownload() {
+    launchUrl(
+      Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
   // 问题反馈
   feedback() {
     launchUrl(

lib/pages/bangumi/introduction/controller.dart

@@ -9,6 +9,7 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply/index.dart';
+import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -21,7 +22,7 @@ class BangumiIntroController extends GetxController {
       ? int.parse(Get.parameters['seasonId']!)
       : null;
   var epId = Get.parameters['epId'] != null
-      ? int.parse(Get.parameters['epId']!)
+      ? int.tryParse(Get.parameters['epId']!)
       : null;
 
   // 是否预渲染 骨架屏
@@ -257,7 +258,7 @@ class BangumiIntroController extends GetxController {
     VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.cid = cid;
+    videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
     // 重新请求评论
@@ -292,4 +293,31 @@ class BangumiIntroController extends GetxController {
     }
     return result;
   }
+
+  /// 列表循环或者顺序播放时，自动播放下一个
+  void nextPlay() {
+    late List episodes;
+    if (bangumiDetail.value.episodes != null) {
+      episodes = bangumiDetail.value.episodes!;
+    }
+    VideoDetailController videoDetailCtr =
+        Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
+    int currentIndex =
+        episodes.indexWhere((e) => e.cid == videoDetailCtr.cid.value);
+    int nextIndex = currentIndex + 1;
+    PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
+    // 列表循环
+    if (platRepeat == PlayRepeat.listCycle) {
+      if (nextIndex == episodes.length - 1) {
+        nextIndex = 0;
+      }
+    }
+    if (nextIndex <= episodes.length - 1 &&
+        platRepeat == PlayRepeat.listOrder) {}
+
+    int cid = episodes[nextIndex].cid!;
+    String bvid = episodes[nextIndex].bvid!;
+    int aid = episodes[nextIndex].aid!;
+    changeSeasonOrbangu(bvid, cid, aid);
+  }
 }

lib/pages/bangumi/introduction/view.dart

@@ -5,7 +5,6 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
@@ -34,10 +33,12 @@ class BangumiIntroPanel extends StatefulWidget {
 
 class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     with AutomaticKeepAliveClientMixin {
-  final BangumiIntroController bangumiIntroController =
-      Get.put(BangumiIntroController(), tag: Get.arguments['heroTag']);
+  late BangumiIntroController bangumiIntroController;
+  late VideoDetailController videoDetailCtr;
   BangumiInfoModel? bangumiDetail;
   late Future _futureBuilderFuture;
+  late int cid;
+  late String heroTag;
 
 // 添加页面缓存
   @override
@@ -46,10 +47,19 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
   @override
   void initState() {
     super.initState();
+    heroTag = Get.arguments['heroTag'];
+    cid = widget.cid!;
+    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
+    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
       bangumiDetail = value;
     });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
+    videoDetailCtr.cid.listen((p0) {
+      print('🐶🐶$p0');
+      cid = p0;
+      setState(() {});
+    });
   }
 
   @override
@@ -61,22 +71,25 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
         if (snapshot.connectionState == ConnectionState.done) {
           if (snapshot.data['status']) {
             // 请求成功
+
             return BangumiInfo(
               loadingStatus: false,
               bangumiDetail: bangumiDetail,
+              cid: cid,
             );
           } else {
             // 请求错误
-            return HttpError(
-              errMsg: snapshot.data['msg'],
-              fn: () => Get.back(),
-            );
+            // return HttpError(
+            //   errMsg: snapshot.data['msg'],
+            //   fn: () => Get.back(),
+            // );
+            return SizedBox();
           }
         } else {
           return BangumiInfo(
             loadingStatus: true,
             bangumiDetail: bangumiDetail,
-            cid: widget.cid,
+            cid: cid,
           );
         }
       },
@@ -108,7 +121,14 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -117,6 +137,12 @@ class _BangumiInfoState extends State<BangumiInfo> {
     bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
+    print('cid:  $cid');
+    videoDetailCtr.cid.listen((p0) {
+      cid = p0;
+      print('cid:  $cid');
+      setState(() {});
+    });
   }
 
   // 收藏
@@ -260,9 +286,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     Text(
                                       !widget.loadingStatus
-                                          ? widget.bangumiDetail!.areas!
-                                              .first['name']
-                                          : bangumiItem!.areas!.first['name'],
+                                          ? (widget.bangumiDetail!.areas!
+                                                  .isNotEmpty
+                                              ? widget.bangumiDetail!.areas!
+                                                  .first['name']
+                                              : '')
+                                          : (bangumiItem!.areas!.isNotEmpty
+                                              ? bangumiItem!
+                                                  .areas!.first['name']
+                                              : ''),
                                       style: TextStyle(
                                         fontSize: 12,
                                         color: t.colorScheme.outline,
@@ -370,7 +402,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.thumbsUp),
                       selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap: () => bangumiIntroController.actionLikeVideo(),
+                      onTap: handleState(bangumiIntroController.actionLikeVideo),
                       selectStatus: bangumiIntroController.hasLike.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -381,7 +413,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.b),
                       selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap: () => bangumiIntroController.actionCoinVideo(),
+                      onTap: handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -430,7 +462,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: () => videoIntroController.actionLikeVideo(),
+          onTap: handleState(videoIntroController.actionLikeVideo),
           selectStatus: videoIntroController.hasLike.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus
@@ -442,7 +474,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.b),
-          onTap: () => videoIntroController.actionCoinVideo(),
+          onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus

lib/pages/bangumi/view.dart

@@ -6,6 +6,7 @@ import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/rcmd/view.dart';
 
@@ -35,6 +36,8 @@ class _BangumiPageState extends State<BangumiPage>
     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(
@@ -51,8 +54,10 @@ class _BangumiPageState extends State<BangumiPage>
             scrollController.position.userScrollDirection;
         if (direction == ScrollDirection.forward) {
           mainStream.add(true);
+          searchBarStream.add(true);
         } else if (direction == ScrollDirection.reverse) {
           mainStream.add(false);
+          searchBarStream.add(false);
         }
       },
     );
@@ -113,6 +118,9 @@ class _BangumiPageState extends State<BangumiPage>
                         builder: (context, snapshot) {
                           if (snapshot.connectionState ==
                               ConnectionState.done) {
+                            if (snapshot.data == null) {
+                              return const SizedBox();
+                            }
                             Map data = snapshot.data as Map;
                             List list = _bangumidController.bangumiFollowList;
                             if (data['status']) {
@@ -198,7 +206,7 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
-          const LoadingMore()
+          LoadingMore()
         ],
       ),
     );

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 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';
 
 class BangumiPanel extends StatefulWidget {
   final List<EpisodeItem> pages;
@@ -30,16 +33,29 @@ class _BangumiPanelState extends State<BangumiPanel> {
   dynamic userInfo;
   // 默认未开通
   int vipStatus = 0;
+  late int cid;
+  String heroTag = Get.arguments['heroTag'];
+  late final VideoDetailController videoDetailCtr;
+  final ItemScrollController itemScrollController = ItemScrollController();
 
   @override
   void initState() {
     super.initState();
-    currentIndex = widget.pages.indexWhere((e) => e.cid == widget.cid!);
+    cid = widget.cid!;
+    currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
     scrollToIndex();
     userInfo = userInfoCache.get('userInfoCache');
     if (userInfo != null) {
       vipStatus = userInfo.vipStatus;
     }
+    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+
+    videoDetailCtr.cid.listen((p0) {
+      cid = p0;
+      setState(() {});
+      currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
+      scrollToIndex();
+    });
   }
 
   @override
@@ -56,10 +72,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
         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);
+              // 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(
@@ -87,42 +104,39 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   ),
                   Expanded(
                     child: Material(
-                      child: ListView.builder(
-                        controller: listViewScrollCtr_2,
+                      child: ScrollablePositionedList.builder(
                         itemCount: widget.pages.length,
-                        itemBuilder: (context, index) {
-                          return 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,
-                              ),
+                        itemBuilder: (context, 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(),
-                          );
-                        },
+                          ),
+                          trailing: widget.pages[index].badge != null
+                              ? Image.asset(
+                                  'assets/images/big-vip.png',
+                                  height: 20,
+                                )
+                              : const SizedBox(),
+                        ),
+                        itemScrollController: itemScrollController,
                       ),
                     ),
                   ),
@@ -222,7 +236,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               children: [
                                 if (i == currentIndex) ...[
                                   Image.asset(
-                                    'assets/images/live.gif',
+                                    'assets/images/live.png',
                                     color:
                                         Theme.of(context).colorScheme.primary,
                                     height: 12,

lib/pages/blacklist/index.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -60,7 +61,7 @@ class _BlackListPageState extends State<BlackListPage> {
         centerTitle: false,
         title: Obx(
           () => Text(
-            '黑名单管理 （${_blackListController.blackList.length} / 5000）',
+            '黑名单管理 - ${_blackListController.total.value}',
             style: Theme.of(context).textTheme.titleMedium,
           ),
         ),
@@ -104,10 +105,11 @@ class _BlackListPageState extends State<BlackListPage> {
                                 overflow: TextOverflow.ellipsis,
                               ),
                               dense: true,
-                              // trailing: TextButton(
-                              //   onPressed: () {},
-                              //   child: const Text('移除'),
-                              // ),
+                              trailing: TextButton(
+                                onPressed: () => _blackListController
+                                    .removeBlack(list[index].mid),
+                                child: const Text('移除'),
+                              ),
                             );
                           },
                         ),
@@ -136,6 +138,7 @@ class _BlackListPageState extends State<BlackListPage> {
 class BlackListController extends GetxController {
   int currentPage = 1;
   int pageSize = 50;
+  RxInt total = 0.obs;
   RxList<BlackListItem> blackList = [BlackListItem()].obs;
 
   Future queryBlacklist({type = 'init'}) async {
@@ -146,6 +149,7 @@ class BlackListController extends GetxController {
     if (result['status']) {
       if (type == 'init') {
         blackList.value = result['data'].list;
+        total.value = result['data'].total;
       } else {
         blackList.addAll(result['data'].list);
       }
@@ -154,4 +158,13 @@ class BlackListController extends GetxController {
     }
     return result;
   }
+
+  Future removeBlack(mid) async {
+    var result = await BlackHttp.removeBlack(fid: mid);
+    if (result['status']) {
+      blackList.removeWhere((e) => e.mid == mid);
+      total.value = total.value - 1;
+      SmartDialog.showToast(result['msg']);
+    }
+  }
 }

lib/pages/danmaku/controller.dart

@@ -3,62 +3,56 @@ import 'package:pilipala/models/danmaku/dm.pb.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 
 class PlDanmakuController {
-  PlDanmakuController(this.cid, this.playerController);
+  PlDanmakuController(this.cid);
   final int cid;
-  final PlPlayerController playerController;
-  late Duration videoDuration;
-  // 按 6min 分段
-  int segCount = 0;
-  List<DmSegMobileReply> dmSegList = [];
-  int currentSegIndex = 0;
-  int currentDmIndex = 0;
+  Map<int,List<DanmakuElem>> dmSegMap = {};
+  // 已请求的段落标记
+  List<bool> requestedSeg = [];
 
-  void calcSegment() {
-    segCount = (videoDuration.inSeconds / (60 * 6)).ceil();
+  bool get initiated => requestedSeg.isNotEmpty;
+
+  static int SEGMENT_LENGTH = 60 * 6 * 1000;
+
+  void initiate(int videoDuration, int progress) {
+    if (requestedSeg.isEmpty) {
+      int segCount = (videoDuration / SEGMENT_LENGTH).ceil();
+      requestedSeg = List<bool>.generate(segCount, (index) => false);
+    }
+    queryDanmaku(
+        calcSegment(progress)
+    );
   }
 
-  Future<List<DmSegMobileReply>> queryDanmaku() async {
-    dmSegList.clear();
-    for (int segIndex = 1; segIndex <= segCount; segIndex++) {
-      DmSegMobileReply result =
-          await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segIndex);
-      if (result.elems.isNotEmpty) {
-        result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
-        dmSegList.add(result);
-      }
-    }
-    if (dmSegList.isNotEmpty) {
-      findClosestPositionIndex(playerController.position.value.inMilliseconds);
-    }
-    return dmSegList;
+  void dispose() {
+    dmSegMap.clear();
+    requestedSeg.clear();
   }
 
-  /// 查询当前最接近的弹幕
-  void findClosestPositionIndex(int position) {
-    int segIndex = (position / (6 * 60 * 1000)).ceil() - 1;
-    if (segIndex < 0) segIndex = 0;
-    List elems = dmSegList[segIndex].elems;
+  int calcSegment(int progress) {
+    return progress ~/ SEGMENT_LENGTH;
+  }
 
-    if (segIndex < dmSegList.length) {
-      int left = 0;
-      int right = elems.length;
-
-      while (left < right) {
-        int mid = (right + left) ~/ 2;
-        var midPosition = elems[mid].progress;
-
-        if (midPosition >= position) {
-          right = mid;
-        } else {
-          left = mid + 1;
+  void queryDanmaku(int segmentIndex) async {
+    assert(requestedSeg[segmentIndex] == false);
+    requestedSeg[segmentIndex] = true;
+    DmSegMobileReply result =
+        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segmentIndex + 1);
+    if (result.elems.isNotEmpty) {
+      for (var element in result.elems) {
+        int pos = element.progress ~/ 100;//每0.1秒存储一次
+        if (dmSegMap[pos] == null) {
+          dmSegMap[pos] = [];
         }
+        dmSegMap[pos]!.add(element);
       }
-
-      currentSegIndex = segIndex;
-      currentDmIndex = right;
-    } else {
-      currentSegIndex = segIndex;
-      currentDmIndex = 0;
     }
   }
+
+  List<DanmakuElem>? getCurrentDanmaku(int progress) {
+    int segmentIndex = calcSegment(progress);
+    if (!requestedSeg[segmentIndex]) {
+      queryDanmaku(segmentIndex);
+    }
+    return dmSegMap[progress ~/ 100];
+  }
 }

lib/pages/danmaku/view.dart

@@ -1,7 +1,9 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
+import 'package:pilipala/models/danmaku/dm.pb.dart';
 import 'package:pilipala/pages/danmaku/index.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/danmaku.dart';
@@ -26,9 +28,15 @@ class _PlDanmakuState extends State<PlDanmaku> {
   late PlPlayerController playerController;
   late PlDanmakuController _plDanmakuController;
   DanmakuController? _controller;
-  bool danmuPlayStatus = true;
+  // bool danmuPlayStatus = true;
   Box setting = GStrorage.setting;
   late bool enableShowDanmaku;
+  late List blockTypes;
+  late double showArea;
+  late double opacityVal;
+  late double fontSizeVal;
+  late double danmakuDurationVal;
+  int latestAddedPosition = -1;
 
   @override
   void initState() {
@@ -36,28 +44,32 @@ class _PlDanmakuState extends State<PlDanmaku> {
     enableShowDanmaku =
         setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
     _plDanmakuController =
-        PlDanmakuController(widget.cid, widget.playerController);
+        PlDanmakuController(widget.cid);
     if (mounted) {
       playerController = widget.playerController;
-      _plDanmakuController.videoDuration = playerController.duration.value;
       if (enableShowDanmaku || playerController.isOpenDanmu.value) {
-        _plDanmakuController
-          ..calcSegment()
-          ..queryDanmaku();
+        _plDanmakuController.initiate(
+            playerController.duration.value.inMilliseconds,
+            playerController.position.value.inMilliseconds
+        );
       }
       playerController
         ..addStatusLister(playerListener)
         ..addPositionListener(videoPositionListen);
     }
     playerController.isOpenDanmu.listen((p0) {
-      if (p0) {
-        if (_plDanmakuController.dmSegList.isEmpty) {
-          _plDanmakuController
-            ..calcSegment()
-            ..queryDanmaku();
-        }
+      if (p0 && !_plDanmakuController.initiated) {
+        _plDanmakuController.initiate(
+            playerController.duration.value.inMilliseconds,
+            playerController.position.value.inMilliseconds
+        );
       }
     });
+    blockTypes = playerController.blockTypes;
+    showArea = playerController.showArea;
+    opacityVal = playerController.opacityVal;
+    fontSizeVal = playerController.fontSizeVal;
+    danmakuDurationVal = playerController.danmakuDurationVal;
   }
 
   // 播放器状态监听
@@ -71,50 +83,32 @@ class _PlDanmakuState extends State<PlDanmaku> {
   }
 
   void videoPositionListen(Duration position) {
-    if (!danmuPlayStatus) {
-      _controller!.onResume();
-      danmuPlayStatus = true;
-    }
-    PlDanmakuController ctr = _plDanmakuController;
-    int currentPosition = position.inMilliseconds;
-
     if (!playerController.isOpenDanmu.value) {
       return;
     }
-    // 超出分段数返回
-    if (ctr.currentSegIndex >= ctr.dmSegList.length) {
-      return;
-    }
-    if (ctr.dmSegList.isEmpty ||
-        ctr.dmSegList[ctr.currentSegIndex].elems.isEmpty) {
-      return;
-    }
-    // 超出当前分段的弹幕总数返回
-    if (ctr.currentDmIndex >= ctr.dmSegList[ctr.currentSegIndex].elems.length) {
-      ctr.currentDmIndex = 0;
-      ctr.currentSegIndex++;
-      return;
-    }
-    var element = ctr.dmSegList[ctr.currentSegIndex].elems[ctr.currentDmIndex];
-    var delta = currentPosition - element.progress;
+    int currentPosition = position.inMilliseconds;
+    currentPosition -= currentPosition % 100;//取整百的毫秒数
 
-    if (delta >= 0 && delta < 200) {
-      _controller!.addItems([
-        DanmakuItem(
-          element.content,
-          color: DmUtils.decimalToColor(element.color),
-          time: element.progress,
-          type: DmUtils.getPosition(element.mode),
-        )
-      ]);
-      ctr.currentDmIndex++;
-    } else {
-      if (!playerController.isOpenDanmu.value) {
-        _controller!.pause();
-        danmuPlayStatus = false;
-        return;
-      }
-      ctr.findClosestPositionIndex(position.inMilliseconds);
+    if (currentPosition == latestAddedPosition) {
+      return;
+    }
+    latestAddedPosition = currentPosition;
+
+    List<DanmakuElem>? currentDanmakuList =
+        _plDanmakuController.getCurrentDanmaku(currentPosition);
+
+    if (currentDanmakuList != null) {
+      Color? defaultColor = playerController.blockTypes.contains(6) ?
+        DmUtils.decimalToColor(16777215) : null;
+
+      _controller!.addItems(
+        currentDanmakuList.map((e) => DanmakuItem(
+          e.content,
+          color: defaultColor ?? DmUtils.decimalToColor(e.color),
+          time: e.progress,
+          type: DmUtils.getPosition(e.mode),
+        )).toList()
+      );
     }
   }
 
@@ -126,22 +120,31 @@ class _PlDanmakuState extends State<PlDanmaku> {
 
   @override
   Widget build(BuildContext context) {
-    return Obx(
-      () => AnimatedOpacity(
-        opacity: playerController.isOpenDanmu.value ? 1 : 0,
-        duration: const Duration(milliseconds: 100),
-        child: DanmakuView(
-          createdController: (DanmakuController e) async {
-            widget.playerController.danmakuController = _controller = e;
-          },
-          option: DanmakuOption(
-            fontSize: 15,
-            area: 0.5,
-            duration: 5,
+    return LayoutBuilder(builder: (context, box) {
+      // double initDuration = box.maxWidth / 12;
+      return Obx(
+        () => AnimatedOpacity(
+          opacity: playerController.isOpenDanmu.value ? 1 : 0,
+          duration: const Duration(milliseconds: 100),
+          child: DanmakuView(
+            createdController: (DanmakuController e) async {
+              widget.playerController.danmakuController = _controller = e;
+            },
+            option: DanmakuOption(
+              fontSize: 15 * fontSizeVal,
+              area: showArea,
+              opacity: opacityVal,
+              hideTop: blockTypes.contains(5),
+              hideScroll: blockTypes.contains(2),
+              hideBottom: blockTypes.contains(4),
+              duration: danmakuDurationVal / widget.playerController.playbackSpeed,
+              // initDuration /
+              //     (danmakuSpeedVal * widget.playerController.playbackSpeed),
+            ),
+            statusChanged: (isPlaying) {},
           ),
-          statusChanged: (isPlaying) {},
         ),
-      ),
-    );
+      );
+    });
   }
 }

lib/pages/dynamics/controller.dart

@@ -149,10 +149,30 @@ class DynamicsController extends GetxController {
       case 'DYNAMIC_TYPE_ARTICLE':
         String title = item.modules.moduleDynamic.major.opus.title;
         String url = item.modules.moduleDynamic.major.opus.jumpUrl;
-        Get.toNamed(
-          '/webview',
-          parameters: {'url': 'https:$url', 'type': 'note', 'pageTitle': title},
-        );
+        if (url.contains('opus') || url.contains('read')) {
+          RegExp digitRegExp = RegExp(r'\d+');
+          Iterable<Match> matches = digitRegExp.allMatches(url);
+          String number = matches.first.group(0)!;
+          if (url.contains('read')) {
+            number = 'cv$number';
+          }
+          Get.toNamed('/htmlRender', parameters: {
+            'url': url.startsWith('//') ? url.split('//').last : url,
+            'title': title,
+            'id': number,
+            'dynamicType': url.split('//').last.split('/')[1]
+          });
+        } else {
+          Get.toNamed(
+            '/webview',
+            parameters: {
+              'url': 'https:$url',
+              'type': 'note',
+              'pageTitle': title
+            },
+          );
+        }
+
         break;
       case 'DYNAMIC_TYPE_PGC':
         print('番剧');

lib/pages/dynamics/deatil/controller.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/reply.dart';
@@ -17,6 +18,7 @@ class DynamicDetailController extends GetxController {
   RxString noMore = ''.obs;
   RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
   RxInt acount = 0.obs;
+  final ScrollController scrollController = ScrollController();
 
   ReplySortType _sortType = ReplySortType.time;
   RxString sortTypeTitle = ReplySortType.time.titles.obs;

lib/pages/dynamics/deatil/view.dart

@@ -2,6 +2,7 @@ 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:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
@@ -9,7 +10,10 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/pages/dynamics/deatil/index.dart';
 import 'package:pilipala/pages/dynamics/widgets/author_panel.dart';
 import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
+import 'package:pilipala/pages/video/detail/replyNew/index.dart';
 import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/id_utils.dart';
 
 import '../widgets/dynamic_panel.dart';
 
@@ -21,15 +25,18 @@ class DynamicDetailPage extends StatefulWidget {
   State<DynamicDetailPage> createState() => _DynamicDetailPageState();
 }
 
-class _DynamicDetailPageState extends State<DynamicDetailPage> {
-  late DynamicDetailController? _dynamicDetailController;
+class _DynamicDetailPageState extends State<DynamicDetailPage>
+    with TickerProviderStateMixin {
+  late DynamicDetailController _dynamicDetailController;
+  late AnimationController fabAnimationCtr;
   Future? _futureBuilderFuture;
   late StreamController<bool> titleStreamC; // appBar title
-  final ScrollController scrollController = ScrollController();
+  late ScrollController scrollController;
   bool _visibleTitle = false;
   String? action;
   // 回复类型
   late int type;
+  bool _isFabVisible = true;
 
   @override
   void initState() {
@@ -38,39 +45,42 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
     // floor 1原创 2转发
     if (Get.arguments['floor'] == 1) {
       oid = int.parse(Get.arguments['item'].basic!['comment_id_str']);
+      print(oid);
     } else {
-      oid = Get.arguments['item'].modules.moduleDynamic.major.draw.id;
+      try {
+        String type = Get.arguments['item'].modules.moduleDynamic.major.type;
+
+        /// TODO
+        if (type == 'MAJOR_TYPE_OPUS') {
+        } else {
+          oid = Get.arguments['item'].modules.moduleDynamic.major.draw.id;
+        }
+      } catch (_) {}
     }
-    int commentType = Get.arguments['item'].basic!['comment_type'] ?? 11;
+    int commentType = 11;
+    try {
+      commentType = Get.arguments['item'].basic!['comment_type'];
+    } catch (_) {}
     type = (commentType == 0) ? 11 : commentType;
 
     action =
         Get.arguments.containsKey('action') ? Get.arguments['action'] : null;
-    _dynamicDetailController = Get.put(DynamicDetailController(oid, type));
-    _futureBuilderFuture = _dynamicDetailController!.queryReplyList();
+    _dynamicDetailController =
+        Get.put(DynamicDetailController(oid, type), tag: oid.toString());
+    _futureBuilderFuture = _dynamicDetailController.queryReplyList();
     titleStreamC = StreamController<bool>();
-    scrollController.addListener(_listen);
     if (action == 'comment') {
       _visibleTitle = true;
       titleStreamC.add(true);
     }
-  }
 
-  void _listen() async {
-    if (scrollController.position.pixels >=
-        scrollController.position.maxScrollExtent - 300) {
-      EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
-        _dynamicDetailController!.queryReplyList(reqType: 'onLoad');
-      });
-    }
-
-    if (scrollController.offset > 55 && !_visibleTitle) {
-      _visibleTitle = true;
-      titleStreamC.add(true);
-    } else if (scrollController.offset <= 55 && _visibleTitle) {
-      _visibleTitle = false;
-      titleStreamC.add(false);
-    }
+    fabAnimationCtr = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    );
+    fabAnimationCtr.forward();
+    // 滚动事件监听
+    scrollListener();
   }
 
   void replyReply(replyItem) {
@@ -97,9 +107,58 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
     );
   }
 
+  void scrollListener() {
+    scrollController = _dynamicDetailController.scrollController;
+    scrollController.addListener(
+      () {
+        // 分页加载
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 300) {
+          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
+            _dynamicDetailController.queryReplyList(reqType: 'onLoad');
+          });
+        }
+
+        // 标题
+        if (scrollController.offset > 55 && !_visibleTitle) {
+          _visibleTitle = true;
+          titleStreamC.add(true);
+        } else if (scrollController.offset <= 55 && _visibleTitle) {
+          _visibleTitle = false;
+          titleStreamC.add(false);
+        }
+
+        // fab按钮
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          _showFab();
+        } else if (direction == ScrollDirection.reverse) {
+          _hideFab();
+        }
+      },
+    );
+  }
+
+  void _showFab() {
+    if (!_isFabVisible) {
+      _isFabVisible = true;
+      fabAnimationCtr.forward();
+    }
+  }
+
+  void _hideFab() {
+    if (_isFabVisible) {
+      _isFabVisible = false;
+      fabAnimationCtr.reverse();
+    }
+  }
+
   @override
   void dispose() {
     scrollController.removeListener(() {});
+    fabAnimationCtr.dispose();
+    scrollController.dispose();
     super.dispose();
   }
 
@@ -118,7 +177,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
             return AnimatedOpacity(
               opacity: snapshot.data ? 1 : 0,
               duration: const Duration(milliseconds: 300),
-              child: author(_dynamicDetailController!.item, context),
+              child: AuthorPanel(item: _dynamicDetailController.item),
             );
           },
         ),
@@ -126,155 +185,206 @@ class _DynamicDetailPageState extends State<DynamicDetailPage> {
       ),
       body: RefreshIndicator(
         onRefresh: () async {
-          await _dynamicDetailController!.queryReplyList();
+          await _dynamicDetailController.queryReplyList();
         },
-        child: CustomScrollView(
-          controller: scrollController,
-          slivers: [
-            if (action != 'comment')
-              SliverToBoxAdapter(
-                child: DynamicPanel(
-                  item: _dynamicDetailController!.item,
-                  source: 'detail',
-                ),
-              ),
-            SliverPersistentHeader(
-              delegate: _MySliverPersistentHeaderDelegate(
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.surface,
-                    border: Border(
-                      top: BorderSide(
-                        width: 0.6,
-                        color: Theme.of(context).dividerColor.withOpacity(0.05),
-                      ),
+        child: Stack(
+          children: [
+            CustomScrollView(
+              controller: scrollController,
+              slivers: [
+                if (action != 'comment')
+                  SliverToBoxAdapter(
+                    child: DynamicPanel(
+                      item: _dynamicDetailController.item,
+                      source: 'detail',
                     ),
                   ),
-                  height: 45,
-                  padding: const EdgeInsets.only(left: 12, right: 6),
-                  child: Row(
-                    children: [
-                      Obx(
-                        () => AnimatedSwitcher(
-                          duration: const Duration(milliseconds: 400),
-                          transitionBuilder:
-                              (Widget child, Animation<double> animation) {
-                            return ScaleTransition(
-                                scale: animation, child: child);
-                          },
-                          child: Text(
-                            '${_dynamicDetailController!.acount.value}',
-                            key: ValueKey<int>(
-                                _dynamicDetailController!.acount.value),
+                SliverPersistentHeader(
+                  delegate: _MySliverPersistentHeaderDelegate(
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.surface,
+                        border: Border(
+                          top: BorderSide(
+                            width: 0.6,
+                            color: Theme.of(context)
+                                .dividerColor
+                                .withOpacity(0.05),
                           ),
                         ),
                       ),
-                      const Text('条回复'),
-                      const Spacer(),
-                      SizedBox(
-                        height: 35,
-                        child: TextButton.icon(
-                          onPressed: () =>
-                              _dynamicDetailController!.queryBySort(),
-                          icon: const Icon(Icons.sort, size: 16),
-                          label: Obx(() => Text(
-                                _dynamicDetailController!.sortTypeLabel.value,
-                                style: const TextStyle(fontSize: 13),
-                              )),
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-              ),
-              pinned: true,
-            ),
-            FutureBuilder(
-              future: _futureBuilderFuture,
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
-                  Map data = snapshot.data as Map;
-                  if (snapshot.data['status']) {
-                    // 请求成功
-                    return Obx(
-                      () => _dynamicDetailController!.replyList.isEmpty &&
-                              _dynamicDetailController!.isLoadingMore
-                          ? SliverList(
-                              delegate:
-                                  SliverChildBuilderDelegate((context, index) {
-                                return const VideoReplySkeleton();
-                              }, childCount: 8),
-                            )
-                          : SliverList(
-                              delegate: SliverChildBuilderDelegate(
-                                (context, index) {
-                                  if (index ==
-                                      _dynamicDetailController!
-                                          .replyList.length) {
-                                    return Container(
-                                      padding: EdgeInsets.only(
-                                          bottom: MediaQuery.of(context)
-                                              .padding
-                                              .bottom),
-                                      height: MediaQuery.of(context)
-                                              .padding
-                                              .bottom +
-                                          100,
-                                      child: Center(
-                                        child: Obx(
-                                          () => Text(
-                                            _dynamicDetailController!
-                                                .noMore.value,
-                                            style: TextStyle(
-                                              fontSize: 12,
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .outline,
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    );
-                                  } else {
-                                    return ReplyItem(
-                                      replyItem: _dynamicDetailController!
-                                          .replyList[index],
-                                      showReplyRow: true,
-                                      replyLevel: '1',
-                                      replyReply: (replyItem) =>
-                                          replyReply(replyItem),
-                                      replyType: ReplyType.values[type],
-                                      addReply: (replyItem) {
-                                        _dynamicDetailController!
-                                            .replyList[index].replies!
-                                            .add(replyItem);
-                                      },
-                                    );
-                                  }
-                                },
-                                childCount:
-                                    _dynamicDetailController!.replyList.length +
-                                        1,
+                      height: 45,
+                      padding: const EdgeInsets.only(left: 12, right: 6),
+                      child: Row(
+                        children: [
+                          Obx(
+                            () => AnimatedSwitcher(
+                              duration: const Duration(milliseconds: 400),
+                              transitionBuilder:
+                                  (Widget child, Animation<double> animation) {
+                                return ScaleTransition(
+                                    scale: animation, child: child);
+                              },
+                              child: Text(
+                                '${_dynamicDetailController.acount.value}',
+                                key: ValueKey<int>(
+                                    _dynamicDetailController.acount.value),
                               ),
                             ),
+                          ),
+                          const Text('条回复'),
+                          const Spacer(),
+                          SizedBox(
+                            height: 35,
+                            child: TextButton.icon(
+                              onPressed: () =>
+                                  _dynamicDetailController.queryBySort(),
+                              icon: const Icon(Icons.sort, size: 16),
+                              label: Obx(() => Text(
+                                    _dynamicDetailController
+                                        .sortTypeLabel.value,
+                                    style: const TextStyle(fontSize: 13),
+                                  )),
+                            ),
+                          )
+                        ],
+                      ),
+                    ),
+                  ),
+                  pinned: true,
+                ),
+                FutureBuilder(
+                  future: _futureBuilderFuture,
+                  builder: (context, snapshot) {
+                    if (snapshot.connectionState == ConnectionState.done) {
+                      Map data = snapshot.data as Map;
+                      if (snapshot.data['status']) {
+                        // 请求成功
+                        return Obx(
+                          () => _dynamicDetailController.replyList.isEmpty &&
+                                  _dynamicDetailController.isLoadingMore
+                              ? SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                      (context, index) {
+                                    return const VideoReplySkeleton();
+                                  }, childCount: 8),
+                                )
+                              : SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                    (context, index) {
+                                      if (index ==
+                                          _dynamicDetailController
+                                              .replyList.length) {
+                                        return Container(
+                                          padding: EdgeInsets.only(
+                                              bottom: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom),
+                                          height: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom +
+                                              100,
+                                          child: Center(
+                                            child: Obx(
+                                              () => Text(
+                                                _dynamicDetailController
+                                                    .noMore.value,
+                                                style: TextStyle(
+                                                  fontSize: 12,
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .outline,
+                                                ),
+                                              ),
+                                            ),
+                                          ),
+                                        );
+                                      } else {
+                                        return ReplyItem(
+                                          replyItem: _dynamicDetailController
+                                              .replyList[index],
+                                          showReplyRow: true,
+                                          replyLevel: '1',
+                                          replyReply: (replyItem) =>
+                                              replyReply(replyItem),
+                                          replyType: ReplyType.values[type],
+                                          addReply: (replyItem) {
+                                            _dynamicDetailController
+                                                .replyList[index].replies!
+                                                .add(replyItem);
+                                          },
+                                        );
+                                      }
+                                    },
+                                    childCount: _dynamicDetailController
+                                            .replyList.length +
+                                        1,
+                                  ),
+                                ),
+                        );
+                      } else {
+                        // 请求错误
+                        return HttpError(
+                          errMsg: data['msg'],
+                          fn: () => setState(() {}),
+                        );
+                      }
+                    } else {
+                      // 骨架屏
+                      return SliverList(
+                        delegate: SliverChildBuilderDelegate((context, index) {
+                          return const VideoReplySkeleton();
+                        }, childCount: 8),
+                      );
+                    }
+                  },
+                )
+              ],
+            ),
+            Positioned(
+              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(CurvedAnimation(
+                  parent: fabAnimationCtr,
+                  curve: Curves.easeInOut,
+                )),
+                child: FloatingActionButton(
+                  heroTag: null,
+                  onPressed: () {
+                    feedBack();
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder: (BuildContext context) {
+                        return VideoReplyNewDialog(
+                          oid: _dynamicDetailController.oid ??
+                              IdUtils.bv2av(Get.parameters['bvid']!),
+                          root: 0,
+                          parent: 0,
+                          replyType: ReplyType.values[type],
+                        );
+                      },
+                    ).then(
+                      (value) => {
+                        // 完成评论，数据添加
+                        if (value != null && value['data'] != null)
+                          {
+                            _dynamicDetailController.replyList
+                                .add(value['data']),
+                            _dynamicDetailController.acount.value++
+                          }
+                      },
                     );
-                  } else {
-                    // 请求错误
-                    return HttpError(
-                      errMsg: data['msg'],
-                      fn: () => setState(() {}),
-                    );
-                  }
-                } else {
-                  // 骨架屏
-                  return SliverList(
-                    delegate: SliverChildBuilderDelegate((context, index) {
-                      return const VideoReplySkeleton();
-                    }, childCount: 8),
-                  );
-                }
-              },
-            )
+                  },
+                  tooltip: '评论动态',
+                  child: const Icon(Icons.reply),
+                ),
+              ),
+            ),
           ],
         ),
       ),

lib/pages/dynamics/view.dart

@@ -212,6 +212,9 @@ class _DynamicsPageState extends State<DynamicsPage>
               future: _futureBuilderFutureUp,
               builder: (context, snapshot) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SliverToBoxAdapter(child: SizedBox());
+                  }
                   Map data = snapshot.data;
                   if (data['status']) {
                     return Obx(() => UpPanel(_dynamicsController.upData.value));
@@ -228,10 +231,22 @@ 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) {
                 if (snapshot.connectionState == ConnectionState.done) {
+                  if (snapshot.data == null) {
+                    return const SliverToBoxAdapter(child: SizedBox());
+                  }
                   Map data = snapshot.data;
                   if (data['status']) {
                     List<DynamicItemModel> list =