diff --git a/README.md b/README.md
index 470e9a35..228d17bb 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ QQ频道: https://pd.qq.com/s/365esodk3
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
   - [x] 弹幕
-  - [ ] 字幕
+  - [x] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等
      
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c52d8447..f119eb1e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
         android:fullBackupContent="false"
         tools:replace="android:allowBackup">
         <activity
-            android:name="com.ryanheise.audioservice.AudioServiceActivity"
+            android:name="com.guozhigq.pilipala.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
diff --git a/android/app/src/main/kotlin/com/guozhigq/pilipala/MainActivity.kt b/android/app/src/main/kotlin/com/guozhigq/pilipala/MainActivity.kt
index 117c85ef..b6876760 100644
--- a/android/app/src/main/kotlin/com/guozhigq/pilipala/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/guozhigq/pilipala/MainActivity.kt
@@ -1,6 +1,8 @@
 package com.guozhigq.pilipala
 
-import io.flutter.embedding.android.FlutterActivity
+// import io.flutter.embedding.android.FlutterActivity
+import com.ryanheise.audioservice.AudioServiceActivity;
 
-class MainActivity: FlutterActivity() {
+class MainActivity: AudioServiceActivity() {
+    
 }
diff --git a/android/build.gradle b/android/build.gradle
index 713d7f6e..674e96f4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         mavenCentral()
diff --git a/assets/images/coin.png b/assets/images/coin.png
new file mode 100644
index 00000000..bc2952a7
Binary files /dev/null and b/assets/images/coin.png differ
diff --git a/assets/loading.json b/assets/loading.json
new file mode 100644
index 00000000..38bccbed
--- /dev/null
+++ b/assets/loading.json
@@ -0,0 +1 @@
+{"v":"5.7.11","fr":60,"ip":0,"op":81,"w":1920,"h":1080,"nm":"Loading Dots","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Dot4","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":39,"s":[100]},{"t":55,"s":[25]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":25,"s":[1142,540,0],"to":[0,-6.667,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":39,"s":[1142,500,0],"to":[0,0,0],"ti":[0,-6.667,0]},{"t":55,"s":[1142,540,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-284,92,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":25,"s":[50,50,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[75,75,100]},{"t":55,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[120,120],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.0039,0.6157,0.5686,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-284,92],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Dot3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":17,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":31,"s":[100]},{"t":47,"s":[25]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":17,"s":[1022,540,0],"to":[0,-6.667,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":31,"s":[1022,500,0],"to":[0,0,0],"ti":[0,-6.667,0]},{"t":47,"s":[1022,540,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-284,92,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":17,"s":[50,50,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":31,"s":[75,75,100]},{"t":47,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[120,120],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.0039,0.6157,0.5686,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-284,92],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Dot2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[100]},{"t":39,"s":[25]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":9,"s":[902,540,0],"to":[0,-6.667,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":23,"s":[902,500,0],"to":[0,0,0],"ti":[0,0,0]},{"t":39,"s":[902,540,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-284,92,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[50,50,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":23,"s":[75,75,100]},{"t":39,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[120,120],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.0039,0.6157,0.5686,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-284,92],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Dot1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[25]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":14,"s":[100]},{"t":30,"s":[25]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[782,540,0],"to":[0,-6.667,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":14,"s":[782,500,0],"to":[0,0,0],"ti":[0,-6.667,0]},{"t":30,"s":[782,540,0]}],"ix":2,"l":2},"a":{"a":0,"k":[-284,92,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[50,50,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":14,"s":[75,75,100]},{"t":30,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[120,120],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.0039,0.6157,0.5686,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-284,92],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/assets/trail_loading.json b/assets/trail_loading.json
new file mode 100644
index 00000000..9fb39ea6
--- /dev/null
+++ b/assets/trail_loading.json
@@ -0,0 +1 @@
+{"v":"4.6.8","fr":60,"ip":0,"op":106,"w":500,"h":500,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 5","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":20,"s":[0],"e":[360]},{"t":110}]},"p":{"a":0,"k":[251,250,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[10,10]},"p":{"a":0,"k":[0,-100]},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[0,0,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.7294118,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":20,"op":620,"st":20,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 4","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":15,"s":[0],"e":[360]},{"t":105}]},"p":{"a":0,"k":[251,250,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[20,20]},"p":{"a":0,"k":[0,-100]},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[0,0,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.7294118,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":15,"op":615,"st":15,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 3","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":10,"s":[0],"e":[360]},{"t":100}]},"p":{"a":0,"k":[251,250,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[30,30]},"p":{"a":0,"k":[0,-100]},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[0,0,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.7294118,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":10,"op":610,"st":10,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 2","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":5,"s":[0],"e":[360]},{"t":95}]},"p":{"a":0,"k":[251,250,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[40,40]},"p":{"a":0,"k":[0,-100]},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[0,0,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.7294118,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":5,"op":605,"st":5,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"Shape Layer 1","ks":{"o":{"a":0,"k":100},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":0,"s":[0],"e":[360]},{"t":90}]},"p":{"a":0,"k":[250,250,0]},"a":{"a":0,"k":[0,0,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":0,"s":[50,50],"e":[40,40]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":84,"s":[40,40],"e":[50,50]},{"t":100}]},"p":{"a":0,"k":[0,-100]},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse"},{"ty":"st","c":{"a":0,"k":[0,0,0,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0,0.7294118,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":600,"st":0,"bm":0,"sr":1}]}
\ No newline at end of file
diff --git a/change_log/1.0.22.0430.md b/change_log/1.0.22.0430.md
new file mode 100644
index 00000000..29f8aecf
--- /dev/null
+++ b/change_log/1.0.22.0430.md
@@ -0,0 +1,27 @@
+## 1.0.22
+
+### 功能
++ 字幕
++ 全屏时选集
++ 动态转发
++ 评论视频并转发
++ 收藏夹删除
++ 合集显示封面
++ 底部导航栏编辑、排序功能
++ 历史记录进度条展示
++ 直播画质切换
++ 排行榜功能
++ 视频详情页推荐视频开关
++ 显示联合投稿up
+  
+### 修复
++ 收藏夹个数错误
++ 封面保存权限问题
++ 合集最后1p未展示
++ up主页关注按钮触发灰屏
+
+### 优化
++ 视频简介查看逻辑
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
diff --git a/change_log/1.0.23.0504.md b/change_log/1.0.23.0504.md
new file mode 100644
index 00000000..afd401fa
--- /dev/null
+++ b/change_log/1.0.23.0504.md
@@ -0,0 +1,14 @@
+## 1.0.23
+
+### 功能
++ 封面下载
+
+  
+### 修复
++ 全屏问题
++ 视频播放器灰屏问题
++ 评论区点击区域问题
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..7c569640 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 2c1a635b..a400600f 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -10,7 +10,6 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - FlutterMacOS
-    - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -24,7 +23,7 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - gt3_flutter_plugin (0.0.8):
+  - gt3_flutter_plugin (0.0.9):
     - Flutter
     - GT3Captcha-iOS
   - GT3Captcha-iOS (0.15.8.3)
@@ -41,7 +40,6 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
-  - ReachabilitySwift (5.0.0)
   - saver_gallery (0.0.1):
     - Flutter
   - screen_brightness_ios (0.1.0):
@@ -101,7 +99,6 @@ SPEC REPOS:
   trunk:
     - FMDB
     - GT3Captcha-iOS
-    - ReachabilitySwift
     - Toast
 
 EXTERNAL SOURCES:
@@ -167,22 +164,21 @@ SPEC CHECKSUMS:
   audio_service: f509d65da41b9521a61f1c404dd58651f265a567
   audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23
+  gt3_flutter_plugin: 5bd2c08d3c19cbb6ee3b08f4358439e54c8ab2ee
   GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
@@ -190,11 +186,11 @@ SPEC CHECKSUMS:
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
   system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
   Toast: ec33c32b8688982cecc6348adeae667c1b9938da
-  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
+  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
 
 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index bac856d2..55565d40 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a6b826db..5e31d3d3 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 65906625..1e7d9fed 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -49,6 +49,8 @@
 		<true/>
 		<key>NSPhotoLibraryAddUsageDescription</key>
 		<string>请允许APP保存图片到相册</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>请允许APP保存图片到相册</string>
 		<key>NSCameraUsageDescription</key>
 		<string>App需要您的同意,才能访问相册</string>
 		<key>NSAppleMusicUsageDescription</key>
diff --git a/lib/common/pages_bottom_sheet.dart b/lib/common/pages_bottom_sheet.dart
index c64b58b6..49e9b4d8 100644
--- a/lib/common/pages_bottom_sheet.dart
+++ b/lib/common/pages_bottom_sheet.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import '../models/common/video_episode_type.dart';
 
@@ -44,27 +45,52 @@ class EpisodeBottomSheet {
         title = '第${episode.title}话  ${episode.longTitle!}';
         break;
     }
-    return ListTile(
-      onTap: () {
-        SmartDialog.showToast('切换至「$title」');
-        changeFucCall.call(episode, index);
-      },
-      dense: false,
-      leading: isCurrentIndex
-          ? Image.asset(
-              'assets/images/live.gif',
-              color: primary,
-              height: 12,
-            )
-          : null,
-      title: Text(
-        title,
-        style: TextStyle(
-          fontSize: 14,
-          color: isCurrentIndex ? primary : onSurface,
-        ),
-      ),
-    );
+    return isFullScreen || episode?.cover == null || episode?.cover == ''
+        ? ListTile(
+            onTap: () {
+              SmartDialog.showToast('切换至「$title」');
+              changeFucCall.call(episode, index);
+            },
+            dense: false,
+            leading: isCurrentIndex
+                ? Image.asset(
+                    'assets/images/live.gif',
+                    color: primary,
+                    height: 12,
+                  )
+                : null,
+            title: Text(title,
+                style: TextStyle(
+                  fontSize: 14,
+                  color: isCurrentIndex ? primary : onSurface,
+                )))
+        : InkWell(
+            onTap: () {
+              SmartDialog.showToast('切换至「$title」');
+              changeFucCall.call(episode, index);
+            },
+            child: Padding(
+              padding:
+                  const EdgeInsets.only(left: 14, right: 14, top: 8, bottom: 8),
+              child: Row(
+                children: [
+                  NetworkImgLayer(
+                      width: 130, height: 75, src: episode?.cover ?? ''),
+                  const SizedBox(width: 10),
+                  Expanded(
+                    child: Text(
+                      title,
+                      maxLines: 2,
+                      style: TextStyle(
+                        fontSize: 14,
+                        color: isCurrentIndex ? primary : onSurface,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
   }
 
   Widget buildTitle() {
@@ -98,7 +124,7 @@ class EpisodeBottomSheet {
       });
       return Container(
         height: sheetHeight,
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         child: Column(
           children: [
             buildTitle(),
diff --git a/lib/common/skeleton/skeleton.dart b/lib/common/skeleton/skeleton.dart
index 34e87f55..b17a55fc 100644
--- a/lib/common/skeleton/skeleton.dart
+++ b/lib/common/skeleton/skeleton.dart
@@ -13,8 +13,8 @@ class Skeleton extends StatelessWidget {
     var shimmerGradient = LinearGradient(
       colors: [
         Colors.transparent,
-        Theme.of(context).colorScheme.background.withAlpha(10),
-        Theme.of(context).colorScheme.background.withAlpha(10),
+        Theme.of(context).colorScheme.surface.withAlpha(10),
+        Theme.of(context).colorScheme.surface.withAlpha(10),
         Colors.transparent,
       ],
       stops: const [
diff --git a/lib/common/widgets/http_error.dart b/lib/common/widgets/http_error.dart
index cbc6659b..b130faae 100644
--- a/lib/common/widgets/http_error.dart
+++ b/lib/common/widgets/http_error.dart
@@ -34,7 +34,7 @@ class HttpError extends StatelessWidget {
                 fn!();
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.resolveWith((states) {
+                backgroundColor: WidgetStateProperty.resolveWith((states) {
                   return Theme.of(context).colorScheme.primary.withAlpha(20);
                 }),
               ),
diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart
index 06c35974..d2772478 100644
--- a/lib/common/widgets/network_img_layer.dart
+++ b/lib/common/widgets/network_img_layer.dart
@@ -34,9 +34,11 @@ class NetworkImgLayer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final int defaultImgQuality = GlobalData().imgQuality;
+    if (src == '' || src == null) {
+      return placeholder(context);
+    }
     final String imageUrl =
         '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
-    print(imageUrl);
     int? memCacheWidth, memCacheHeight;
     double aspectRatio = (width / height).toDouble();
 
diff --git a/lib/common/widgets/overlay_pop.dart b/lib/common/widgets/overlay_pop.dart
deleted file mode 100644
index fe9b9377..00000000
--- a/lib/common/widgets/overlay_pop.dart
+++ /dev/null
@@ -1,86 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../utils/download.dart';
-import '../constants.dart';
-import 'network_img_layer.dart';
-
-class OverlayPop extends StatelessWidget {
-  const OverlayPop({super.key, this.videoItem, this.closeFn});
-
-  final dynamic videoItem;
-  final Function? closeFn;
-
-  @override
-  Widget build(BuildContext context) {
-    final double imgWidth = MediaQuery.sizeOf(context).width - 8 * 2;
-    return Container(
-      margin: const EdgeInsets.symmetric(horizontal: 8),
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
-        borderRadius: BorderRadius.circular(10.0),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Stack(
-            children: [
-              NetworkImgLayer(
-                width: imgWidth,
-                height: imgWidth / StyleString.aspectRatio,
-                src: videoItem.pic! as String,
-                quality: 100,
-              ),
-              Positioned(
-                right: 8,
-                top: 8,
-                child: Container(
-                  width: 30,
-                  height: 30,
-                  decoration: BoxDecoration(
-                      color: Colors.black.withOpacity(0.3),
-                      borderRadius:
-                          const BorderRadius.all(Radius.circular(20))),
-                  child: IconButton(
-                    style: ButtonStyle(
-                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                    ),
-                    onPressed: () => closeFn!(),
-                    icon: const Icon(
-                      Icons.close,
-                      size: 18,
-                      color: Colors.white,
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-          Padding(
-              padding: const EdgeInsets.fromLTRB(12, 10, 8, 10),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Text(
-                      videoItem.title! as String,
-                    ),
-                  ),
-                  const SizedBox(width: 4),
-                  IconButton(
-                    tooltip: '保存封面图',
-                    onPressed: () async {
-                      await DownloadUtils.downloadImg(
-                        videoItem.pic != null
-                            ? videoItem.pic as String
-                            : videoItem.cover as String,
-                      );
-                      // closeFn!();
-                    },
-                    icon: const Icon(Icons.download, size: 20),
-                  )
-                ],
-              )),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart
index c1c439db..511839a0 100644
--- a/lib/common/widgets/stat/danmu.dart
+++ b/lib/common/widgets/stat/danmu.dart
@@ -14,7 +14,7 @@ class StatDanMu extends StatelessWidget {
     Map<String, Color> colorObject = {
       'white': Colors.white,
       'gray': Theme.of(context).colorScheme.outline,
-      'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8),
+      'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
     return Row(
diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart
index 2665e2d4..5359c979 100644
--- a/lib/common/widgets/stat/view.dart
+++ b/lib/common/widgets/stat/view.dart
@@ -14,7 +14,7 @@ class StatView extends StatelessWidget {
     Map<String, Color> colorObject = {
       'white': Colors.white,
       'gray': Theme.of(context).colorScheme.outline,
-      'black': Theme.of(context).colorScheme.onBackground.withOpacity(0.8),
+      'black': Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
     };
     Color color = colorObject[theme]!;
     return Row(
diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
index 99059a9e..c674b223 100644
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -1,6 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/http/constants.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/image_save.dart';
+import 'package:pilipala/utils/route_push.dart';
+import 'package:pilipala/utils/url_utils.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
 import '../../http/video.dart';
@@ -16,23 +21,24 @@ class VideoCardH extends StatelessWidget {
   const VideoCardH({
     super.key,
     required this.videoItem,
-    this.longPress,
-    this.longPressEnd,
+    this.onPressedFn,
     this.source = 'normal',
     this.showOwner = true,
     this.showView = true,
     this.showDanmaku = true,
     this.showPubdate = false,
+    this.showCharge = false,
   });
   // ignore: prefer_typing_uninitialized_variables
   final videoItem;
-  final Function()? longPress;
-  final Function()? longPressEnd;
+  final Function()? onPressedFn;
+  // normal 推荐, later 稍后再看, search 搜索
   final String source;
   final bool showOwner;
   final bool showView;
   final bool showDanmaku;
   final bool showPubdate;
+  final bool showCharge;
 
   @override
   Widget build(BuildContext context) {
@@ -43,102 +49,117 @@ class VideoCardH extends StatelessWidget {
       type = videoItem.type;
     } catch (_) {}
     final String heroTag = Utils.makeHeroTag(aid);
-    return GestureDetector(
-      onLongPress: () {
-        if (longPress != null) {
-          longPress!();
+    return InkWell(
+      onTap: () async {
+        try {
+          if (type == 'ketang') {
+            SmartDialog.showToast('课堂视频暂不支持播放');
+            return;
+          }
+          if (showCharge && videoItem?.typeid == 33) {
+            final String redirectUrl = await UrlUtils.parseRedirectUrl(
+                '${HttpString.baseUrl}/video/$bvid/');
+            final String lastPathSegment = redirectUrl.split('/').last;
+            if (lastPathSegment.contains('ss')) {
+              RoutePush.bangumiPush(
+                  Utils.matchNum(lastPathSegment).first, null);
+            }
+            if (lastPathSegment.contains('ep')) {
+              RoutePush.bangumiPush(
+                  null, Utils.matchNum(lastPathSegment).first);
+            }
+            return;
+          }
+          final int cid =
+              videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
+          Get.toNamed('/video?bvid=$bvid&cid=$cid',
+              arguments: {'videoItem': videoItem, 'heroTag': heroTag});
+        } catch (err) {
+          SmartDialog.showToast(err.toString());
         }
       },
-      // onLongPressEnd: (details) {
-      //   if (longPressEnd != null) {
-      //     longPressEnd!();
-      //   }
-      // },
-      child: InkWell(
-        onTap: () async {
-          try {
-            if (type == 'ketang') {
-              SmartDialog.showToast('课堂视频暂不支持播放');
-              return;
-            }
-            final int cid =
-                videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
-            Get.toNamed('/video?bvid=$bvid&cid=$cid',
-                arguments: {'videoItem': videoItem, 'heroTag': heroTag});
-          } catch (err) {
-            SmartDialog.showToast(err.toString());
-          }
-        },
-        child: Padding(
-          padding: const EdgeInsets.fromLTRB(
-              StyleString.safeSpace, 5, StyleString.safeSpace, 5),
-          child: LayoutBuilder(
-            builder: (BuildContext context, BoxConstraints boxConstraints) {
-              final double width = (boxConstraints.maxWidth -
-                      StyleString.cardSpace *
-                          6 /
-                          MediaQuery.textScalerOf(context).scale(1.0)) /
-                  2;
-              return Container(
-                constraints: const BoxConstraints(minHeight: 88),
-                height: width / StyleString.aspectRatio,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    AspectRatio(
-                      aspectRatio: StyleString.aspectRatio,
-                      child: LayoutBuilder(
-                        builder: (BuildContext context,
-                            BoxConstraints boxConstraints) {
-                          final double maxWidth = boxConstraints.maxWidth;
-                          final double maxHeight = boxConstraints.maxHeight;
-                          return Stack(
-                            children: [
-                              Hero(
-                                tag: heroTag,
-                                child: NetworkImgLayer(
-                                  src: videoItem.pic as String,
-                                  width: maxWidth,
-                                  height: maxHeight,
-                                ),
+      onLongPress: () => imageSaveDialog(
+        context,
+        videoItem,
+        SmartDialog.dismiss,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(
+            StyleString.safeSpace, 5, StyleString.safeSpace, 5),
+        child: LayoutBuilder(
+          builder: (BuildContext context, BoxConstraints boxConstraints) {
+            final double width = (boxConstraints.maxWidth -
+                    StyleString.cardSpace *
+                        6 /
+                        MediaQuery.textScalerOf(context).scale(1.0)) /
+                2;
+            return Container(
+              constraints: const BoxConstraints(minHeight: 88),
+              height: width / StyleString.aspectRatio,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  AspectRatio(
+                    aspectRatio: StyleString.aspectRatio,
+                    child: LayoutBuilder(
+                      builder: (BuildContext context,
+                          BoxConstraints boxConstraints) {
+                        final double maxWidth = boxConstraints.maxWidth;
+                        final double maxHeight = boxConstraints.maxHeight;
+                        return Stack(
+                          children: [
+                            Hero(
+                              tag: heroTag,
+                              child: NetworkImgLayer(
+                                src: videoItem.pic as String,
+                                width: maxWidth,
+                                height: maxHeight,
                               ),
-                              if (videoItem.duration != 0)
-                                PBadge(
-                                  text: Utils.timeFormat(videoItem.duration!),
-                                  right: 6.0,
-                                  bottom: 6.0,
-                                  type: 'gray',
-                                ),
-                              if (type != 'video')
-                                PBadge(
-                                  text: type,
-                                  left: 6.0,
-                                  bottom: 6.0,
-                                  type: 'primary',
-                                ),
-                              // if (videoItem.rcmdReason != null &&
-                              //     videoItem.rcmdReason.content != '')
-                              //   pBadge(videoItem.rcmdReason.content, context,
-                              //       6.0, 6.0, null, null),
-                            ],
-                          );
-                        },
-                      ),
+                            ),
+                            if (videoItem.duration != 0)
+                              PBadge(
+                                text: Utils.timeFormat(videoItem.duration!),
+                                right: 6.0,
+                                bottom: 6.0,
+                                type: 'gray',
+                              ),
+                            if (type != 'video')
+                              PBadge(
+                                text: type,
+                                left: 6.0,
+                                bottom: 6.0,
+                                type: 'primary',
+                              ),
+                            // if (videoItem.rcmdReason != null &&
+                            //     videoItem.rcmdReason.content != '')
+                            //   pBadge(videoItem.rcmdReason.content, context,
+                            //       6.0, 6.0, null, null),
+                            if (showCharge && videoItem?.isChargingSrc)
+                              const PBadge(
+                                text: '充电专属',
+                                right: 6.0,
+                                top: 6.0,
+                                type: 'primary',
+                              ),
+                          ],
+                        );
+                      },
                     ),
-                    VideoContent(
-                      videoItem: videoItem,
-                      source: source,
-                      showOwner: showOwner,
-                      showView: showView,
-                      showDanmaku: showDanmaku,
-                      showPubdate: showPubdate,
-                    )
-                  ],
-                ),
-              );
-            },
-          ),
+                  ),
+                  VideoContent(
+                    videoItem: videoItem,
+                    source: source,
+                    showOwner: showOwner,
+                    showView: showView,
+                    showDanmaku: showDanmaku,
+                    showPubdate: showPubdate,
+                    onPressedFn: onPressedFn,
+                  )
+                ],
+              ),
+            );
+          },
         ),
       ),
     );
@@ -153,6 +174,7 @@ class VideoContent extends StatelessWidget {
   final bool showView;
   final bool showDanmaku;
   final bool showPubdate;
+  final Function()? onPressedFn;
 
   const VideoContent({
     super.key,
@@ -162,6 +184,7 @@ class VideoContent extends StatelessWidget {
     this.showView = true,
     this.showDanmaku = true,
     this.showPubdate = false,
+    this.onPressedFn,
   });
 
   @override
@@ -172,7 +195,7 @@ class VideoContent extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            if (videoItem.title is String) ...[
+            if (source == 'normal' || source == 'later') ...[
               Text(
                 videoItem.title as String,
                 textAlign: TextAlign.start,
@@ -187,7 +210,7 @@ class VideoContent extends StatelessWidget {
                 maxLines: 2,
                 text: TextSpan(
                   children: [
-                    for (final i in videoItem.title) ...[
+                    for (final i in videoItem.titleList) ...[
                       TextSpan(
                         text: i['text'] as String,
                         style: TextStyle(
@@ -254,117 +277,44 @@ class VideoContent extends StatelessWidget {
                     theme: 'gray',
                     danmu: videoItem.stat.danmaku as int,
                   ),
-
                 const Spacer(),
-                // SizedBox(
-                //   width: 20,
-                //   height: 20,
-                //   child: IconButton(
-                //     tooltip: '稍后再看',
-                //     style: ButtonStyle(
-                //       padding: MaterialStateProperty.all(EdgeInsets.zero),
-                //     ),
-                //     onPressed: () async {
-                //       var res =
-                //           await UserHttp.toViewLater(bvid: videoItem.bvid);
-                //       SmartDialog.showToast(res['msg']);
-                //     },
-                //     icon: Icon(
-                //       Icons.more_vert_outlined,
-                //       color: Theme.of(context).colorScheme.outline,
-                //       size: 14,
-                //     ),
-                //   ),
-                // ),
                 if (source == 'normal')
                   SizedBox(
                     width: 24,
                     height: 24,
-                    child: PopupMenuButton<String>(
+                    child: IconButton(
                       padding: EdgeInsets.zero,
+                      onPressed: () {
+                        feedBack();
+                        showModalBottomSheet(
+                          context: context,
+                          useRootNavigator: true,
+                          isScrollControlled: true,
+                          builder: (context) {
+                            return MorePanel(videoItem: videoItem);
+                          },
+                        );
+                      },
                       icon: Icon(
                         Icons.more_vert_outlined,
                         color: Theme.of(context).colorScheme.outline,
                         size: 14,
                       ),
-                      position: PopupMenuPosition.under,
-                      // constraints: const BoxConstraints(maxHeight: 35),
-                      onSelected: (String type) {},
-                      itemBuilder: (BuildContext context) =>
-                          <PopupMenuEntry<String>>[
-                        PopupMenuItem<String>(
-                          onTap: () async {
-                            var res = await UserHttp.toViewLater(
-                                bvid: videoItem.bvid as String);
-                            SmartDialog.showToast(res['msg']);
-                          },
-                          value: 'pause',
-                          height: 40,
-                          child: const Row(
-                            children: [
-                              Icon(Icons.watch_later_outlined, size: 16),
-                              SizedBox(width: 6),
-                              Text('稍后再看', style: TextStyle(fontSize: 13))
-                            ],
-                          ),
-                        ),
-                        const PopupMenuDivider(),
-                        PopupMenuItem<String>(
-                          onTap: () async {
-                            SmartDialog.show(
-                              useSystem: true,
-                              animationType:
-                                  SmartAnimationType.centerFade_otherSlide,
-                              builder: (BuildContext context) {
-                                return AlertDialog(
-                                  title: const Text('提示'),
-                                  content: Text(
-                                      '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
-                                      '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
-                                  actions: [
-                                    TextButton(
-                                      onPressed: () => SmartDialog.dismiss(),
-                                      child: Text(
-                                        '点错了',
-                                        style: TextStyle(
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .outline),
-                                      ),
-                                    ),
-                                    TextButton(
-                                      onPressed: () async {
-                                        var res = await VideoHttp.relationMod(
-                                          mid: videoItem.owner.mid,
-                                          act: 5,
-                                          reSrc: 11,
-                                        );
-                                        SmartDialog.dismiss();
-                                        SmartDialog.showToast(res['code'] == 0
-                                            ? '成功'
-                                            : res['msg']);
-                                      },
-                                      child: const Text('确认'),
-                                    )
-                                  ],
-                                );
-                              },
-                            );
-                          },
-                          value: 'pause',
-                          height: 40,
-                          child: Row(
-                            children: [
-                              const Icon(Icons.block, size: 16),
-                              const SizedBox(width: 6),
-                              Text('拉黑：${videoItem.owner.name}',
-                                  style: const TextStyle(fontSize: 13))
-                            ],
-                          ),
-                        ),
-                      ],
                     ),
                   ),
+                if (source == 'later') ...[
+                  IconButton(
+                    style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero),
+                    ),
+                    onPressed: () => onPressedFn?.call(),
+                    icon: Icon(
+                      Icons.clear_outlined,
+                      color: Theme.of(context).colorScheme.outline,
+                      size: 18,
+                    ),
+                  )
+                ],
               ],
             ),
           ],
@@ -373,3 +323,110 @@ class VideoContent extends StatelessWidget {
     );
   }
 }
+
+class MorePanel extends StatelessWidget {
+  final dynamic videoItem;
+  const MorePanel({super.key, required this.videoItem});
+
+  Future<dynamic> menuActionHandler(String type) async {
+    switch (type) {
+      case 'block':
+        blockUser();
+        break;
+      case 'watchLater':
+        var res = await UserHttp.toViewLater(bvid: videoItem.bvid as String);
+        SmartDialog.showToast(res['msg']);
+        Get.back();
+        break;
+      default:
+    }
+  }
+
+  void blockUser() async {
+    SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: Text('确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+              '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+          actions: [
+            TextButton(
+              onPressed: () => SmartDialog.dismiss(),
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                var res = await VideoHttp.relationMod(
+                  mid: videoItem.owner.mid,
+                  act: 5,
+                  reSrc: 11,
+                );
+                SmartDialog.dismiss();
+                SmartDialog.showToast(res['msg'] ?? '成功');
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          InkWell(
+            onTap: () => Get.back(),
+            child: Container(
+              height: 35,
+              padding: const EdgeInsets.only(bottom: 2),
+              child: Center(
+                child: Container(
+                  width: 32,
+                  height: 3,
+                  decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.outline,
+                      borderRadius: const BorderRadius.all(Radius.circular(3))),
+                ),
+              ),
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('block'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.block, size: 19),
+            title: Text(
+              '拉黑up主 「${videoItem.owner.name}」',
+              style: Theme.of(context).textTheme.titleSmall,
+            ),
+          ),
+          ListTile(
+            onTap: () async => await menuActionHandler('watchLater'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.watch_later_outlined, size: 19),
+            title:
+                Text('添加至稍后再看', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          ListTile(
+            onTap: () =>
+                imageSaveDialog(context, videoItem, SmartDialog.dismiss),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.photo_outlined, size: 19),
+            title:
+                Text('查看视频封面', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
index 0d96f7b7..14476cdf 100644
--- a/lib/common/widgets/video_card_v.dart
+++ b/lib/common/widgets/video_card_v.dart
@@ -1,14 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/image_save.dart';
+import 'package:pilipala/utils/route_push.dart';
 import '../../models/model_rec_video_item.dart';
 import 'stat/danmu.dart';
 import 'stat/view.dart';
 import '../../http/dynamics.dart';
-import '../../http/search.dart';
 import '../../http/user.dart';
 import '../../http/video.dart';
-import '../../models/common/search_type.dart';
 import '../../utils/id_utils.dart';
 import '../../utils/utils.dart';
 import '../constants.dart';
@@ -19,15 +20,13 @@ import 'network_img_layer.dart';
 class VideoCardV extends StatelessWidget {
   final dynamic videoItem;
   final int crossAxisCount;
-  final Function()? longPress;
-  final Function()? longPressEnd;
+  final Function? blockUserCb;
 
   const VideoCardV({
     Key? key,
     required this.videoItem,
     required this.crossAxisCount,
-    this.longPress,
-    this.longPressEnd,
+    this.blockUserCb,
   }) : super(key: key);
 
   bool isStringNumeric(String str) {
@@ -44,23 +43,11 @@ class VideoCardV extends StatelessWidget {
           return;
         }
         int epId = videoItem.param;
-        SmartDialog.showLoading(msg: '资源获取中');
-        var result = await SearchHttp.bangumiInfo(seasonId: null, epId: epId);
-        if (result['status']) {
-          var bangumiDetail = result['data'];
-          int cid = bangumiDetail.episodes!.first.cid;
-          String bvid = IdUtils.av2bv(bangumiDetail.episodes!.first.aid);
-          SmartDialog.dismiss().then(
-            (value) => Get.toNamed(
-              '/video?bvid=$bvid&cid=$cid&epId=$epId',
-              arguments: {
-                'pic': videoItem.pic,
-                'heroTag': heroTag,
-                'videoType': SearchType.media_bangumi,
-              },
-            ),
-          );
-        }
+        RoutePush.bangumiPush(
+          null,
+          epId,
+          heroTag: heroTag,
+        );
         break;
       case 'av':
         String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid);
@@ -127,64 +114,57 @@ class VideoCardV extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(videoItem.id);
-    return Card(
-      elevation: 0,
-      clipBehavior: Clip.hardEdge,
-      margin: EdgeInsets.zero,
-      child: GestureDetector(
-        onLongPress: () {
-          if (longPress != null) {
-            longPress!();
-          }
-        },
-        // onLongPressEnd: (details) {
-        //   if (longPressEnd != null) {
-        //     longPressEnd!();
-        //   }
-        // },
-        child: InkWell(
-          onTap: () async => onPushDetail(heroTag),
-          child: Column(
-            children: [
-              AspectRatio(
-                aspectRatio: StyleString.aspectRatio,
-                child: LayoutBuilder(builder: (context, boxConstraints) {
-                  double maxWidth = boxConstraints.maxWidth;
-                  double maxHeight = boxConstraints.maxHeight;
-                  return Stack(
-                    children: [
-                      Hero(
-                        tag: heroTag,
-                        child: NetworkImgLayer(
-                          src: videoItem.pic,
-                          width: maxWidth,
-                          height: maxHeight,
-                        ),
-                      ),
-                      if (videoItem.duration > 0)
-                        if (crossAxisCount == 1) ...[
-                          PBadge(
-                            bottom: 10,
-                            right: 10,
-                            text: Utils.timeFormat(videoItem.duration),
-                          )
-                        ] else ...[
-                          PBadge(
-                            bottom: 6,
-                            right: 7,
-                            size: 'small',
-                            type: 'gray',
-                            text: Utils.timeFormat(videoItem.duration),
-                          )
-                        ],
+    return InkWell(
+      onTap: () async => onPushDetail(heroTag),
+      onLongPress: () => imageSaveDialog(
+        context,
+        videoItem,
+        SmartDialog.dismiss,
+      ),
+      borderRadius: BorderRadius.circular(16),
+      child: Column(
+        children: [
+          AspectRatio(
+            aspectRatio: StyleString.aspectRatio,
+            child: LayoutBuilder(builder: (context, boxConstraints) {
+              double maxWidth = boxConstraints.maxWidth;
+              double maxHeight = boxConstraints.maxHeight;
+              return Stack(
+                children: [
+                  Hero(
+                    tag: heroTag,
+                    child: NetworkImgLayer(
+                      src: videoItem.pic,
+                      width: maxWidth,
+                      height: maxHeight,
+                    ),
+                  ),
+                  if (videoItem.duration > 0)
+                    if (crossAxisCount == 1) ...[
+                      PBadge(
+                        bottom: 10,
+                        right: 10,
+                        text: Utils.timeFormat(videoItem.duration),
+                      )
+                    ] else ...[
+                      PBadge(
+                        bottom: 6,
+                        right: 7,
+                        size: 'small',
+                        type: 'gray',
+                        text: Utils.timeFormat(videoItem.duration),
+                      )
                     ],
-                  );
-                }),
-              ),
-              VideoContent(videoItem: videoItem, crossAxisCount: crossAxisCount)
-            ],
+                ],
+              );
+            }),
           ),
-        ),
+          VideoContent(
+            videoItem: videoItem,
+            crossAxisCount: crossAxisCount,
+            blockUserCb: blockUserCb,
+          )
+        ],
       ),
     );
   }
@@ -193,125 +173,102 @@ class VideoCardV extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final int crossAxisCount;
-  const VideoContent(
-      {Key? key, required this.videoItem, required this.crossAxisCount})
-      : super(key: key);
+  final Function? blockUserCb;
+
+  const VideoContent({
+    Key? key,
+    required this.videoItem,
+    required this.crossAxisCount,
+    this.blockUserCb,
+  }) : super(key: key);
+
+  Widget _buildBadge(String text, String type, [double fs = 12]) {
+    return PBadge(
+      text: text,
+      stack: 'normal',
+      size: 'small',
+      type: type,
+      fs: fs,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Expanded(
-      flex: crossAxisCount == 1 ? 0 : 1,
-      child: Padding(
-        padding: crossAxisCount == 1
-            ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
-            : const EdgeInsets.fromLTRB(5, 8, 5, 4),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          // mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Row(
-              children: [
-                Expanded(
-                  child: Text(
-                    videoItem.title,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                  ),
-                ),
-                if (videoItem.goto == 'av' && crossAxisCount == 1) ...[
-                  const SizedBox(width: 10),
-                  VideoPopupMenu(
-                    size: 32,
-                    iconSize: 18,
-                    videoItem: videoItem,
-                  ),
-                ],
-              ],
-            ),
-            if (crossAxisCount > 1) ...[
-              const SizedBox(height: 2),
-              VideoStat(
-                videoItem: videoItem,
-                crossAxisCount: crossAxisCount,
-              ),
-            ],
-            if (crossAxisCount == 1) const SizedBox(height: 4),
-            Row(
-              children: [
-                if (videoItem.goto == 'bangumi') ...[
-                  PBadge(
-                    text: videoItem.bangumiBadge,
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'line',
-                    fs: 9,
-                  )
-                ],
-                if (videoItem.rcmdReason != null &&
-                    videoItem.rcmdReason.content != '') ...[
-                  PBadge(
-                    text: videoItem.rcmdReason.content,
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'color',
-                  )
-                ],
-                if (videoItem.goto == 'picture') ...[
-                  const PBadge(
-                    text: '动态',
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'line',
-                    fs: 9,
-                  )
-                ],
-                if (videoItem.isFollowed == 1) ...[
-                  const PBadge(
-                    text: '已关注',
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'color',
-                  )
-                ],
-                Expanded(
-                  flex: crossAxisCount == 1 ? 0 : 1,
-                  child: Text(
-                    videoItem.owner.name,
-                    maxLines: 1,
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
-                ),
-                if (crossAxisCount == 1) ...[
-                  Text(
-                    ' • ',
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
-                  VideoStat(
-                    videoItem: videoItem,
-                    crossAxisCount: crossAxisCount,
-                  ),
-                  const Spacer(),
-                ],
-                if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
-                  VideoPopupMenu(
-                    size: 24,
-                    iconSize: 14,
-                    videoItem: videoItem,
-                  ),
-                ] else ...[
-                  const SizedBox(height: 24)
-                ]
-              ],
-            ),
+    return Padding(
+      padding: crossAxisCount == 1
+          ? const EdgeInsets.fromLTRB(9, 9, 9, 4)
+          : const EdgeInsets.fromLTRB(5, 8, 5, 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            videoItem.title,
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
+          ),
+          if (crossAxisCount > 1) ...[
+            const SizedBox(height: 2),
+            VideoStat(videoItem: videoItem, crossAxisCount: crossAxisCount),
           ],
-        ),
+          if (crossAxisCount == 1) const SizedBox(height: 4),
+          Row(
+            children: [
+              if (videoItem.goto == 'bangumi')
+                _buildBadge(videoItem.bangumiBadge, 'line', 9),
+              if (videoItem.rcmdReason?.content != null &&
+                  videoItem.rcmdReason.content != '')
+                _buildBadge(videoItem.rcmdReason.content, 'color'),
+              if (videoItem.goto == 'picture') _buildBadge('动态', 'line', 9),
+              if (videoItem.isFollowed == 1) _buildBadge('已关注', 'color'),
+              Expanded(
+                flex: crossAxisCount == 1 ? 0 : 1,
+                child: Text(
+                  videoItem.owner.name,
+                  maxLines: 1,
+                  style: TextStyle(
+                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
+                ),
+              ),
+              if (crossAxisCount == 1) ...[
+                const SizedBox(width: 10),
+                VideoStat(
+                  videoItem: videoItem,
+                  crossAxisCount: crossAxisCount,
+                ),
+                const Spacer(),
+              ],
+              if (videoItem.goto == 'av')
+                SizedBox(
+                  width: 24,
+                  height: 24,
+                  child: IconButton(
+                    padding: EdgeInsets.zero,
+                    onPressed: () {
+                      feedBack();
+                      showModalBottomSheet(
+                        context: context,
+                        useRootNavigator: true,
+                        isScrollControlled: true,
+                        builder: (context) {
+                          return MorePanel(
+                            videoItem: videoItem,
+                            blockUserCb: blockUserCb,
+                          );
+                        },
+                      );
+                    },
+                    icon: Icon(
+                      Icons.more_vert_outlined,
+                      color: Theme.of(context).colorScheme.outline,
+                      size: 14,
+                    ),
+                  ),
+                )
+            ],
+          ),
+        ],
       ),
     );
   }
@@ -331,15 +288,9 @@ class VideoStat extends StatelessWidget {
   Widget build(BuildContext context) {
     return Row(
       children: [
-        StatView(
-          theme: 'gray',
-          view: videoItem.stat.view,
-        ),
+        StatView(theme: 'gray', view: videoItem.stat.view),
         const SizedBox(width: 8),
-        StatDanMu(
-          theme: 'gray',
-          danmu: videoItem.stat.danmu,
-        ),
+        StatDanMu(theme: 'gray', danmu: videoItem.stat.danmu),
         if (videoItem is RecVideoItemModel) ...<Widget>[
           crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
           RichText(
@@ -358,99 +309,116 @@ class VideoStat extends StatelessWidget {
   }
 }
 
-class VideoPopupMenu extends StatelessWidget {
-  final double? size;
-  final double? iconSize;
+class MorePanel extends StatelessWidget {
   final dynamic videoItem;
-
-  const VideoPopupMenu({
-    Key? key,
-    required this.size,
-    required this.iconSize,
+  final Function? blockUserCb;
+  const MorePanel({
+    super.key,
     required this.videoItem,
-  }) : super(key: key);
+    this.blockUserCb,
+  });
+
+  Future<dynamic> menuActionHandler(String type) async {
+    switch (type) {
+      case 'block':
+        Get.back();
+        blockUser();
+        break;
+      case 'watchLater':
+        var res = await UserHttp.toViewLater(bvid: videoItem.bvid as String);
+        SmartDialog.showToast(res['msg']);
+        Get.back();
+        break;
+      default:
+    }
+  }
+
+  void blockUser() async {
+    SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: Text('确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+              '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+          actions: [
+            TextButton(
+              onPressed: () => SmartDialog.dismiss(),
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                var res = await VideoHttp.relationMod(
+                  mid: videoItem.owner.mid,
+                  act: 5,
+                  reSrc: 11,
+                );
+                SmartDialog.dismiss();
+                if (res['status']) {
+                  blockUserCb?.call(videoItem.owner.mid);
+                }
+                SmartDialog.showToast(res['msg']);
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
-    return SizedBox(
-      width: size,
-      height: size,
-      child: PopupMenuButton<String>(
-        padding: EdgeInsets.zero,
-        icon: Icon(
-          Icons.more_vert_outlined,
-          color: Theme.of(context).colorScheme.outline,
-          size: iconSize,
-        ),
-        position: PopupMenuPosition.under,
-        // constraints: const BoxConstraints(maxHeight: 35),
-        onSelected: (String type) {},
-        itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-          PopupMenuItem<String>(
-            onTap: () async {
-              var res =
-                  await UserHttp.toViewLater(bvid: videoItem.bvid as String);
-              SmartDialog.showToast(res['msg']);
-            },
-            value: 'pause',
-            height: 40,
-            child: const Row(
-              children: [
-                Icon(Icons.watch_later_outlined, size: 16),
-                SizedBox(width: 6),
-                Text('稍后再看', style: TextStyle(fontSize: 13))
-              ],
+    return Container(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          InkWell(
+            onTap: () => Get.back(),
+            child: Container(
+              height: 35,
+              padding: const EdgeInsets.only(bottom: 2),
+              child: Center(
+                child: Container(
+                  width: 32,
+                  height: 3,
+                  decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.outline,
+                      borderRadius: const BorderRadius.all(Radius.circular(3))),
+                ),
+              ),
             ),
           ),
-          const PopupMenuDivider(),
-          PopupMenuItem<String>(
-            onTap: () async {
-              SmartDialog.show(
-                useSystem: true,
-                animationType: SmartAnimationType.centerFade_otherSlide,
-                builder: (BuildContext context) {
-                  return AlertDialog(
-                    title: const Text('提示'),
-                    content: Text(
-                        '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
-                        '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
-                    actions: [
-                      TextButton(
-                        onPressed: () => SmartDialog.dismiss(),
-                        child: Text(
-                          '点错了',
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.outline),
-                        ),
-                      ),
-                      TextButton(
-                        onPressed: () async {
-                          var res = await VideoHttp.relationMod(
-                            mid: videoItem.owner.mid,
-                            act: 5,
-                            reSrc: 11,
-                          );
-                          SmartDialog.dismiss();
-                          SmartDialog.showToast(res['msg'] ?? '成功');
-                        },
-                        child: const Text('确认'),
-                      )
-                    ],
-                  );
-                },
-              );
-            },
-            value: 'pause',
-            height: 40,
-            child: Row(
-              children: [
-                const Icon(Icons.block, size: 16),
-                const SizedBox(width: 6),
-                Text('拉黑：${videoItem.owner.name}',
-                    style: const TextStyle(fontSize: 13))
-              ],
+          ListTile(
+            onTap: () async => await menuActionHandler('block'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.block, size: 19),
+            title: Text(
+              '拉黑up主 「${videoItem.owner.name}」',
+              style: Theme.of(context).textTheme.titleSmall,
             ),
           ),
+          ListTile(
+            onTap: () async => await menuActionHandler('watchLater'),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.watch_later_outlined, size: 19),
+            title:
+                Text('添加至稍后再看', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          ListTile(
+            onTap: () =>
+                imageSaveDialog(context, videoItem, SmartDialog.dismiss),
+            minLeadingWidth: 0,
+            leading: const Icon(Icons.photo_outlined, size: 19),
+            title:
+                Text('查看视频封面', style: Theme.of(context).textTheme.titleSmall),
+          ),
+          const SizedBox(height: 20),
         ],
       ),
     );
diff --git a/lib/http/api.dart b/lib/http/api.dart
index e2e973f2..e519d91c 100644
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@@ -189,7 +189,7 @@ class Api {
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索
-  static const String searchByType = '/x/web-interface/search/type';
+  static const String searchByType = '/x/web-interface/wbi/search/type';
 
   // 记录视频播放进度
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/report.md
@@ -400,12 +400,24 @@ class Api {
       '${HttpString.passBaseUrl}/x/passport-login/captcha?source=main_web';
 
   // web端短信验证码
-  static const String smsCode =
+  static const String webSmsCode =
       '${HttpString.passBaseUrl}/x/passport-login/web/sms/send';
 
   // web端验证码登录
+  static const String webSmsLogin =
+      '${HttpString.passBaseUrl}/x/passport-login/web/login/sms';
 
   // web端密码登录
+  static const String loginInByWebPwd =
+      '${HttpString.passBaseUrl}/x/passport-login/web/login';
+
+  // web端二维码
+  static const String qrCodeApi =
+      '${HttpString.passBaseUrl}/x/passport-login/web/qrcode/generate';
+
+  // 扫码登录
+  static const String loginInByQrcode =
+      '${HttpString.passBaseUrl}/x/passport-login/web/qrcode/poll';
 
   // app端短信验证码
   static const String appSmsCode =
@@ -517,4 +529,10 @@ class Api {
 
   /// 创建动态
   static const String dynamicCreate = '/x/dynamic/feed/create/dyn';
+
+  /// 删除收藏夹
+  static const String delFavFolder = '/x/v3/fav/folder/del';
+
+  /// 搜索结果计数
+  static const String searchCount = '/x/web-interface/wbi/search/all/v2';
 }
diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart
index f0740d36..69619361 100644
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@@ -41,6 +41,7 @@ class DynamicsHttp {
         'status': false,
         'data': [],
         'msg': res.data['message'],
+        'code': res.data['code'],
       };
     }
   }
@@ -152,16 +153,28 @@ class DynamicsHttp {
   }
 
   static Future dynamicCreate({
-    required String dynIdStr,
     required int mid,
+    required int scene,
+    int? oid,
+    String? dynIdStr,
     String? rawText,
   }) async {
     DateTime now = DateTime.now();
     int timestamp = now.millisecondsSinceEpoch ~/ 1000;
     Random random = Random();
     int randomNumber = random.nextInt(9000) + 1000;
-    String uploadId =
-        mid.toString() + timestamp.toString() + randomNumber.toString();
+    String uploadId = '${mid}_${timestamp}_$randomNumber';
+
+    Map<String, dynamic> webRepostSrc = {
+      'dyn_id_str': dynIdStr ?? '',
+    };
+
+    /// 投稿转发
+    if (scene == 5) {
+      webRepostSrc = {
+        'revs_id': {'dyn_type': 8, 'rid': oid}
+      };
+    }
     var res = await Request().post(Api.dynamicCreate, queryParameters: {
       'platform': 'web',
       'csrf': await Request.getCsrf(),
@@ -174,14 +187,14 @@ class DynamicsHttp {
             {'raw_text': rawText ?? '', 'type': 1, 'biz_id': ''}
           ]
         },
-        'scene': 4,
+        'scene': scene,
         'attach_card': null,
         'upload_id': uploadId,
         'meta': {
           'app_meta': {'from': 'create.dynamic.web', 'mobi_app': 'web'}
         }
       },
-      'web_repost_src': {'dyn_id_str': dynIdStr}
+      'web_repost_src': webRepostSrc
     });
     if (res.data['code'] == 0) {
       return {
diff --git a/lib/http/interceptor.dart b/lib/http/interceptor.dart
index a5359283..10b5aee5 100644
--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@@ -46,7 +46,7 @@ class ApiInterceptor extends Interceptor {
     // 处理网络请求错误
     // handler.next(err);
     String url = err.requestOptions.uri.toString();
-    if (!url.contains('heartBeat')) {
+    if (!url.contains('heartbeat')) {
       SmartDialog.showToast(
         await dioError(err),
         displayType: SmartToastType.onlyRefresh,
diff --git a/lib/http/login.dart b/lib/http/login.dart
index ff3fee23..2437b72a 100644
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:crypto/crypto.dart';
 import 'package:dio/dio.dart';
 import 'package:encrypt/encrypt.dart';
+import 'package:pilipala/http/constants.dart';
 import 'package:uuid/uuid.dart';
 import '../models/login/index.dart';
 import '../utils/login.dart';
@@ -21,32 +22,32 @@ class LoginHttp {
     }
   }
 
-  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);
-  }
+  // 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({
@@ -60,6 +61,7 @@ class LoginHttp {
     Map data = {
       'cid': cid,
       'tel': tel,
+      "source": "main_web",
       'token': token,
       'challenge': challenge,
       'validate': validate,
@@ -67,17 +69,56 @@ class LoginHttp {
     };
     FormData formData = FormData.fromMap({...data});
     var res = await Request().post(
-      Api.smsCode,
+      Api.webSmsCode,
       data: formData,
       options: Options(
         contentType: Headers.formUrlEncodedContentType,
       ),
     );
-    print(res);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
   }
 
   // web端验证码登录
-  static Future loginInByWebSmsCode() async {}
+  static Future loginInByWebSmsCode({
+    int? cid,
+    required int tel,
+    required int code,
+    required String captchaKey,
+  }) async {
+    // webSmsLogin
+    Map data = {
+      "cid": cid,
+      "tel": tel,
+      "code": code,
+      "source": "main_mini",
+      "keep": 0,
+      "captcha_key": captchaKey,
+      "go_url": HttpString.baseUrl
+    };
+    FormData formData = FormData.fromMap({...data});
+    var res = await Request().post(
+      Api.webSmsLogin,
+      data: formData,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
 
   // web端密码登录
   static Future liginInByWebPwd() async {}
@@ -173,4 +214,69 @@ class LoginHttp {
     );
     print(res);
   }
+
+  // web端密码登录
+  static Future loginInByWebPwd({
+    required int username,
+    required String password,
+    required String token,
+    required String challenge,
+    required String validate,
+    required String seccode,
+  }) async {
+    Map data = {
+      'username': username,
+      'password': password,
+      'keep': 0,
+      'token': token,
+      'challenge': challenge,
+      'validate': validate,
+      'seccode': seccode,
+      'source': 'main-fe-header',
+      "go_url": HttpString.baseUrl
+    };
+    FormData formData = FormData.fromMap({...data});
+    var res = await Request().post(
+      Api.loginInByWebPwd,
+      data: formData,
+      options: Options(
+        contentType: Headers.formUrlEncodedContentType,
+      ),
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
+
+  // web端登录二维码
+  static Future getWebQrcode() async {
+    var res = await Request().get(Api.qrCodeApi);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
+
+  // web端二维码轮询登录状态
+  static Future queryWebQrcodeStatus(String qrcodeKey) async {
+    var res = await Request()
+        .get(Api.loginInByQrcode, data: {'qrcode_key': qrcodeKey});
+    if (res.data['data']['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data'],
+      };
+    } else {
+      return {'status': false, 'data': [], 'msg': res.data['message']};
+    }
+  }
 }
diff --git a/lib/http/reply.dart b/lib/http/reply.dart
index f080ed51..880f9072 100644
--- a/lib/http/reply.dart
+++ b/lib/http/reply.dart
@@ -22,19 +22,14 @@ class ReplyHttp {
       return {
         'status': true,
         'data': ReplyData.fromJson(res.data['data']),
+        'code': 200,
       };
     } else {
-      Map errMap = {
-        -400: '请求错误',
-        -404: '无此项',
-        12002: '当前页面评论功能已关闭',
-        12009: '评论主体的type不合法',
-        12061: 'UP主已关闭评论区',
-      };
       return {
         'status': false,
         'date': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'code': res.data['code'],
+        'msg': res.data['message'],
       };
     }
   }
diff --git a/lib/http/search.dart b/lib/http/search.dart
index 18481ea8..075defc7 100644
--- a/lib/http/search.dart
+++ b/lib/http/search.dart
@@ -1,5 +1,7 @@
 import 'dart:convert';
 import 'package:hive/hive.dart';
+import 'package:pilipala/models/search/all.dart';
+import 'package:pilipala/utils/wbi_sign.dart';
 import '../models/bangumi/info.dart';
 import '../models/common/search_type.dart';
 import '../models/search/hot.dart';
@@ -73,6 +75,7 @@ class SearchHttp {
     required page,
     String? order,
     int? duration,
+    int? tids,
   }) async {
     var reqData = {
       'search_type': searchType.type,
@@ -82,6 +85,7 @@ class SearchHttp {
       'page': page,
       if (order != null) 'order': order,
       if (duration != null) 'duration': duration,
+      if (tids != null && tids != -1) 'tids': tids,
     };
     var res = await Request().get(Api.searchByType, data: reqData);
     if (res.data['code'] == 0 && res.data['data']['numPages'] > 0) {
@@ -163,4 +167,42 @@ class SearchHttp {
       };
     }
   }
+
+  static Future<Map<String, dynamic>> ab2cWithPic(
+      {int? aid, String? bvid}) async {
+    Map<String, dynamic> data = {};
+    if (aid != null) {
+      data['aid'] = aid;
+    } else if (bvid != null) {
+      data['bvid'] = bvid;
+    }
+    final dynamic res =
+        await Request().get(Api.ab2c, data: <String, dynamic>{...data});
+    return {
+      'cid': res.data['data'].first['cid'],
+      'pic': res.data['data'].first['first_frame'],
+    };
+  }
+
+  static Future<Map<String, dynamic>> searchCount(
+      {required String keyword}) async {
+    Map<String, dynamic> data = {
+      'keyword': keyword,
+      'web_location': 333.999,
+    };
+    Map params = await WbiSign().makSign(data);
+    final dynamic res = await Request().get(Api.searchCount, data: params);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': SearchAllModel.fromJson(res.data['data']),
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': '请求错误 🙅',
+      };
+    }
+  }
 }
diff --git a/lib/http/user.dart b/lib/http/user.dart
index fea0a22e..972acfdd 100644
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@@ -62,7 +62,8 @@ class UserHttp {
       return {
         'status': false,
         'data': [],
-        'msg': res.data['message'] ?? '账号未登录'
+        'msg': res.data['message'],
+        'code': res.data['code'],
       };
     }
   }
@@ -111,7 +112,12 @@ class UserHttp {
         'data': {'list': list, 'count': res.data['data']['count']}
       };
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 
@@ -126,7 +132,12 @@ class UserHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': HistoryData.fromJson(res.data['data'])};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 
@@ -326,7 +337,12 @@ class UserHttp {
         'data': SubFolderModelData.fromJson(res.data['data'])
       };
     } else {
-      return {'status': false, 'msg': res.data['message']};
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+        'code': res.data['code'],
+      };
     }
   }
 
@@ -395,4 +411,21 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
+
+  // 删除文件夹
+  static Future delFavFolder({required int mediaIds}) async {
+    var res = await Request().post(
+      Api.delFavFolder,
+      queryParameters: {
+        'media_ids': mediaIds,
+        'platform': 'web',
+        'csrf': await Request.getCsrf(),
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {'status': true};
+    } else {
+      return {'status': false, 'msg': res.data['message']};
+    }
+  }
 }
diff --git a/lib/http/video.dart b/lib/http/video.dart
index d43656b2..7c1d9ba6 100644
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -35,7 +35,7 @@ class VideoHttp {
         Api.recommendListWeb,
         data: {
           'version': 1,
-          'feed_version': 'V8',
+          'feed_version': 'V3',
           'homepage_ver': 1,
           'ps': ps,
           'fresh_idx': freshIdx,
@@ -192,22 +192,15 @@ class VideoHttp {
   // 视频信息 标题、简介
   static Future videoIntro({required String bvid}) async {
     var res = await Request().get(Api.videoIntro, data: {'bvid': bvid});
-    VideoDetailResponse result = VideoDetailResponse.fromJson(res.data);
-    if (result.code == 0) {
+    if (res.data['code'] == 0) {
+      VideoDetailResponse result = VideoDetailResponse.fromJson(res.data);
       return {'status': true, 'data': result.data!};
     } else {
-      Map errMap = {
-        -400: '请求错误',
-        -403: '权限不足',
-        -404: '视频资源失效',
-        62002: '稿件不可见',
-        62004: '稿件审核中',
-      };
       return {
         'status': false,
         'data': null,
-        'code': result.code,
-        'msg': errMap[result.code] ?? '请求异常',
+        'code': res.data['code'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -394,9 +387,15 @@ class VideoHttp {
       'csrf': await Request.getCsrf(),
     });
     if (res.data['code'] == 0) {
-      return {'status': true, 'data': res.data['data']};
+      if (act == 5) {
+        List<int> blackMidsList =
+            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
+        blackMidsList.add(mid);
+        setting.put(SettingBoxKey.blackMidsList, blackMidsList);
+      }
+      return {'status': true, 'data': res.data['data'], 'msg': '成功'};
     } else {
-      return {'status': false, 'data': []};
+      return {'status': false, 'data': [], 'msg': res.data['message']};
     }
   }
 
diff --git a/lib/main.dart b/lib/main.dart
index 3877685c..05c0476c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -16,13 +17,12 @@ 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/disable_battery_opt.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
+import 'package:media_kit/media_kit.dart';
 import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
@@ -30,46 +30,41 @@ import './services/loggeer.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   MediaKit.ensureInitialized();
-  SystemChrome.setPreferredOrientations(
-          [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
-      .then((_) async {
-    await GStrorage.init();
-    await setupServiceLocator();
-    clearLogs();
-    Request();
-    await Request.setCookie();
-    RecommendFilter();
+  await SystemChrome.setPreferredOrientations(
+      [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
+  await GStrorage.init();
+  await setupServiceLocator();
+  clearLogs();
+  Request();
+  await Request.setCookie();
 
-    // 异常捕获 logo记录
-    final Catcher2Options debugConfig = Catcher2Options(
-      SilentReportMode(),
-      [
-        FileHandler(await getLogsPath()),
-        ConsoleHandler(
-          enableDeviceParameters: false,
-          enableApplicationParameters: false,
-        )
-      ],
-    );
+  // 异常捕获 logo记录
+  final Catcher2Options releaseConfig = Catcher2Options(
+    SilentReportMode(),
+    [FileHandler(await getLogsPath())],
+  );
 
-    final Catcher2Options releaseConfig = Catcher2Options(
-      SilentReportMode(),
-      [FileHandler(await getLogsPath())],
-    );
+  Catcher2(
+    releaseConfig: releaseConfig,
+    runAppFunction: () {
+      runApp(const MyApp());
+    },
+  );
 
-    Catcher2(
-      debugConfig: debugConfig,
-      releaseConfig: releaseConfig,
-      runAppFunction: () {
-        runApp(const MyApp());
-      },
-    );
+  // 小白条、导航栏沉浸
+  if (Platform.isAndroid) {
+    final androidInfo = await DeviceInfoPlugin().androidInfo;
+    if (androidInfo.version.sdkInt >= 29) {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    }
+    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+      systemNavigationBarColor: Colors.transparent,
+      systemNavigationBarDividerColor: Colors.transparent,
+      statusBarColor: Colors.transparent,
+    ));
+  }
 
-    Data.init();
-    GlobalData();
-    PiliSchame.init();
-    DisableBatteryOpt();
-  });
+  PiliSchame.init();
 }
 
 class MyApp extends StatelessWidget {
@@ -110,6 +105,39 @@ class MyApp extends StatelessWidget {
       } catch (_) {}
     }
 
+    if (Platform.isAndroid) {
+      return AndroidApp(
+        brandColor: brandColor,
+        isDynamicColor: isDynamicColor,
+        currentThemeValue: currentThemeValue,
+        textScale: textScale,
+      );
+    } else {
+      return OtherApp(
+        brandColor: brandColor,
+        currentThemeValue: currentThemeValue,
+        textScale: textScale,
+      );
+    }
+  }
+}
+
+class AndroidApp extends StatelessWidget {
+  const AndroidApp({
+    super.key,
+    required this.brandColor,
+    required this.isDynamicColor,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final Color brandColor;
+  final bool isDynamicColor;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
     return DynamicColorBuilder(
       builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
         ColorScheme? lightColorScheme;
@@ -129,89 +157,120 @@ class MyApp extends StatelessWidget {
             brightness: Brightness.dark,
           );
         }
-
-        ThemeData themeData = ThemeData(
-          colorScheme: currentThemeValue == ThemeType.dark
-              ? darkColorScheme
-              : lightColorScheme,
-        );
-
-        // 小白条、导航栏沉浸
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-        SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-          systemNavigationBarColor: GlobalData().enableMYBar
-              ? const Color(0x00010000)
-              : themeData.canvasColor,
-          systemNavigationBarDividerColor: GlobalData().enableMYBar
-              ? const Color(0x00010000)
-              : themeData.canvasColor,
-          systemNavigationBarIconBrightness: currentThemeValue == ThemeType.dark
-              ? Brightness.light
-              : Brightness.dark,
-          statusBarColor: Colors.transparent,
-        ));
-
-        // 图片缓存
-        // PaintingBinding.instance.imageCache.maximumSizeBytes = 1000 << 20;
-        return GetMaterialApp(
-          title: 'PiliPala',
-          theme: ThemeData(
-            colorScheme: currentThemeValue == ThemeType.dark
-                ? darkColorScheme
-                : lightColorScheme,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: lightColorScheme.primary,
-              backgroundColor: lightColorScheme.secondaryContainer,
-              closeIconColor: lightColorScheme.secondary,
-              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
-              elevation: 20,
-            ),
-            pageTransitionsTheme: const PageTransitionsTheme(
-              builders: <TargetPlatform, PageTransitionsBuilder>{
-                TargetPlatform.android: ZoomPageTransitionsBuilder(
-                  allowEnterRouteSnapshotting: false,
-                ),
-              },
-            ),
-          ),
-          darkTheme: ThemeData(
-            colorScheme: currentThemeValue == ThemeType.light
-                ? lightColorScheme
-                : darkColorScheme,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: darkColorScheme.primary,
-              backgroundColor: darkColorScheme.secondaryContainer,
-              closeIconColor: darkColorScheme.secondary,
-              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
-              elevation: 20,
-            ),
-          ),
-          localizationsDelegates: const [
-            GlobalCupertinoLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-          ],
-          locale: const Locale("zh", "CN"),
-          supportedLocales: const [Locale("zh", "CN"), Locale("en", "US")],
-          fallbackLocale: const Locale("zh", "CN"),
-          getPages: Routes.getPages,
-          home: const MainApp(),
-          builder: (BuildContext context, Widget? child) {
-            return FlutterSmartDialog(
-              toastBuilder: (String msg) => CustomToast(msg: msg),
-              child: MediaQuery(
-                data: MediaQuery.of(context)
-                    .copyWith(textScaler: TextScaler.linear(textScale)),
-                child: child!,
-              ),
-            );
-          },
-          navigatorObservers: [
-            VideoDetailPage.routeObserver,
-            SearchPage.routeObserver,
-          ],
+        return BuildMainApp(
+          lightColorScheme: lightColorScheme,
+          darkColorScheme: darkColorScheme,
+          currentThemeValue: currentThemeValue,
+          textScale: textScale,
         );
       }),
     );
   }
 }
+
+class OtherApp extends StatelessWidget {
+  const OtherApp({
+    super.key,
+    required this.brandColor,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final Color brandColor;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
+    return BuildMainApp(
+      lightColorScheme: ColorScheme.fromSeed(
+        seedColor: brandColor,
+        brightness: Brightness.light,
+      ),
+      darkColorScheme: ColorScheme.fromSeed(
+        seedColor: brandColor,
+        brightness: Brightness.dark,
+      ),
+      currentThemeValue: currentThemeValue,
+      textScale: textScale,
+    );
+  }
+}
+
+class BuildMainApp extends StatelessWidget {
+  const BuildMainApp({
+    super.key,
+    required this.lightColorScheme,
+    required this.darkColorScheme,
+    required this.currentThemeValue,
+    required this.textScale,
+  });
+
+  final ColorScheme lightColorScheme;
+  final ColorScheme darkColorScheme;
+  final ThemeType currentThemeValue;
+  final double textScale;
+
+  @override
+  Widget build(BuildContext context) {
+    final SnackBarThemeData snackBarTheme = SnackBarThemeData(
+      actionTextColor: lightColorScheme.primary,
+      backgroundColor: lightColorScheme.secondaryContainer,
+      closeIconColor: lightColorScheme.secondary,
+      contentTextStyle: TextStyle(color: lightColorScheme.secondary),
+      elevation: 20,
+    );
+
+    return GetMaterialApp(
+      title: 'PiliPala',
+      theme: ThemeData(
+        colorScheme: currentThemeValue == ThemeType.dark
+            ? darkColorScheme
+            : lightColorScheme,
+        snackBarTheme: snackBarTheme,
+        pageTransitionsTheme: const PageTransitionsTheme(
+          builders: <TargetPlatform, PageTransitionsBuilder>{
+            TargetPlatform.android: ZoomPageTransitionsBuilder(
+              allowEnterRouteSnapshotting: false,
+            ),
+          },
+        ),
+      ),
+      darkTheme: ThemeData(
+        colorScheme: currentThemeValue == ThemeType.light
+            ? lightColorScheme
+            : darkColorScheme,
+        snackBarTheme: snackBarTheme,
+      ),
+      localizationsDelegates: const [
+        GlobalCupertinoLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ],
+      locale: const Locale("zh", "CN"),
+      supportedLocales: const [Locale("zh", "CN"), Locale("en", "US")],
+      fallbackLocale: const Locale("zh", "CN"),
+      getPages: Routes.getPages,
+      home: const MainApp(),
+      builder: (BuildContext context, Widget? child) {
+        return FlutterSmartDialog(
+          toastBuilder: (String msg) => CustomToast(msg: msg),
+          child: MediaQuery(
+            data: MediaQuery.of(context)
+                .copyWith(textScaler: TextScaler.linear(textScale)),
+            child: child!,
+          ),
+        );
+      },
+      navigatorObservers: [
+        VideoDetailPage.routeObserver,
+        SearchPage.routeObserver,
+      ],
+      onInit: () {
+        RecommendFilter();
+        Data.init();
+        GlobalData();
+      },
+    );
+  }
+}
diff --git a/lib/models/bangumi/list.dart b/lib/models/bangumi/list.dart
index c15014d0..fe71bb61 100644
--- a/lib/models/bangumi/list.dart
+++ b/lib/models/bangumi/list.dart
@@ -30,6 +30,7 @@ class BangumiListItemModel {
   BangumiListItemModel({
     this.badge,
     this.badgeType,
+    this.pic,
     this.cover,
     // this.firstEp,
     this.indexShow,
@@ -50,6 +51,7 @@ class BangumiListItemModel {
 
   String? badge;
   int? badgeType;
+  String? pic;
   String? cover;
   String? indexShow;
   int? isFinish;
@@ -70,6 +72,7 @@ class BangumiListItemModel {
   BangumiListItemModel.fromJson(Map<String, dynamic> json) {
     badge = json['badge'] == '' ? null : json['badge'];
     badgeType = json['badge_type'];
+    pic = json['cover'];
     cover = json['cover'];
     indexShow = json['index_show'];
     isFinish = json['is_finish'];
diff --git a/lib/models/common/action_type.dart b/lib/models/common/action_type.dart
new file mode 100644
index 00000000..b888be17
--- /dev/null
+++ b/lib/models/common/action_type.dart
@@ -0,0 +1,93 @@
+// 操作类型的枚举值：点赞 不喜欢 收藏 投币 稍后再看 下载封面 后台播放 听视频 分享 下载视频
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+enum ActionType {
+  like,
+  coin,
+  collect,
+  watchLater,
+  share,
+  dislike,
+  downloadCover,
+  copyLink,
+  // backgroundPlay,
+  // listenVideo,
+  // downloadVideo,
+}
+
+extension ActionTypeExtension on ActionType {
+  String get value => [
+        'like',
+        'coin',
+        'collect',
+        'watchLater',
+        'share',
+        'dislike',
+        'downloadCover',
+        'copyLink',
+        // 'backgroundPlay',
+        // 'listenVideo',
+        // 'downloadVideo',
+      ][index];
+  String get label => [
+        '点赞视频',
+        '投币',
+        '收藏视频',
+        '稍后再看',
+        '视频分享',
+        '不喜欢',
+        '下载封面',
+        '复制链接',
+        // '后台播放',
+        // '听视频',
+        // '下载视频',
+      ][index];
+}
+
+List<Map> actionMenuConfig = [
+  {
+    'icon': const Icon(Icons.thumb_up_alt_outlined),
+    'label': '点赞视频',
+    'value': ActionType.like,
+  },
+  {
+    'icon': Image.asset(
+      'assets/images/coin.png',
+      width: 26,
+      color: IconTheme.of(Get.context!).color!.withOpacity(0.65),
+    ),
+    'label': '投币',
+    'value': ActionType.coin,
+  },
+  {
+    'icon': const Icon(Icons.star_border),
+    'label': '收藏视频',
+    'value': ActionType.collect,
+  },
+  {
+    'icon': const Icon(Icons.watch_later_outlined),
+    'label': '稍后再看',
+    'value': ActionType.watchLater,
+  },
+  {
+    'icon': const Icon(Icons.share),
+    'label': '视频分享',
+    'value': ActionType.share,
+  },
+  {
+    'icon': const Icon(Icons.thumb_down_alt_outlined),
+    'label': '不喜欢',
+    'value': ActionType.dislike,
+  },
+  {
+    'icon': const Icon(Icons.image_outlined),
+    'label': '下载封面',
+    'value': ActionType.downloadCover,
+  },
+  {
+    'icon': const Icon(Icons.link_outlined),
+    'label': '复制链接',
+    'value': ActionType.copyLink,
+  },
+];
diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart
index 2f7c2d40..64a6e5b1 100644
--- a/lib/models/dynamics/result.dart
+++ b/lib/models/dynamics/result.dart
@@ -414,6 +414,8 @@ class DynamicMajorModel {
     this.none,
     this.type,
     this.courses,
+    this.common,
+    this.music,
   });
 
   DynamicArchiveModel? archive;
@@ -429,6 +431,8 @@ class DynamicMajorModel {
   // MAJOR_TYPE_OPUS 图文/文章
   String? type;
   Map? courses;
+  Map? common;
+  Map? music;
 
   DynamicMajorModel.fromJson(Map<String, dynamic> json) {
     archive = json['archive'] != null
@@ -452,6 +456,8 @@ class DynamicMajorModel {
         json['none'] != null ? DynamicNoneModel.fromJson(json['none']) : null;
     type = json['type'];
     courses = json['courses'] ?? {};
+    common = json['common'] ?? {};
+    music = json['music'] ?? {};
   }
 }
 
diff --git a/lib/models/home/rcmd/result.dart b/lib/models/home/rcmd/result.dart
index 78747d1a..0098fe95 100644
--- a/lib/models/home/rcmd/result.dart
+++ b/lib/models/home/rcmd/result.dart
@@ -69,9 +69,10 @@ class RecVideoItemAppModel {
         : null;
     // 由于app端api并不会直接返回与owner的关注状态
     // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效
+    RegExp regex = RegExp(r'已关注|新关注');
     isFollowed = rcmdReason != null &&
             rcmdReason!.content != null &&
-            rcmdReason!.content!.contains('关注')
+            regex.hasMatch(rcmdReason!.content!)
         ? 1
         : 0;
     // 如果是，就无需再显示推荐原因，交由view统一处理即可
diff --git a/lib/models/model_hot_video_item.dart b/lib/models/model_hot_video_item.dart
index db331a4c..ab7e6e04 100644
--- a/lib/models/model_hot_video_item.dart
+++ b/lib/models/model_hot_video_item.dart
@@ -23,6 +23,7 @@ class HotVideoItemModel {
     this.dimension,
     this.shortLinkV2,
     this.firstFrame,
+    this.cover,
     this.pubLocation,
     this.seasontype,
     this.isOgv,
@@ -50,6 +51,7 @@ class HotVideoItemModel {
   Dimension? dimension;
   String? shortLinkV2;
   String? firstFrame;
+  String? cover;
   String? pubLocation;
   int? seasontype;
   bool? isOgv;
@@ -77,6 +79,7 @@ class HotVideoItemModel {
     dimension = Dimension.fromMap(json['dimension']);
     shortLinkV2 = json["short_link_v2"];
     firstFrame = json["first_frame"];
+    cover = json["first_frame"];
     pubLocation = json["pub_location"];
     seasontype = json["seasontype"];
     isOgv = json["isOgv"];
diff --git a/lib/models/search/all.dart b/lib/models/search/all.dart
new file mode 100644
index 00000000..796400da
--- /dev/null
+++ b/lib/models/search/all.dart
@@ -0,0 +1,9 @@
+class SearchAllModel {
+  SearchAllModel({this.topTList});
+
+  Map? topTList;
+
+  SearchAllModel.fromJson(Map<String, dynamic> json) {
+    topTList = json['top_tlist'];
+  }
+}
diff --git a/lib/models/search/result.dart b/lib/models/search/result.dart
index 418fb99d..81917b72 100644
--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@@ -25,6 +25,7 @@ class SearchVideoItemModel {
     this.aid,
     this.bvid,
     this.title,
+    this.titleList,
     this.description,
     this.pic,
     // this.play,
@@ -54,8 +55,8 @@ class SearchVideoItemModel {
   String? arcurl;
   int? aid;
   String? bvid;
-  List? title;
-  // List? titleList;
+  String? title;
+  List? titleList;
   String? description;
   String? pic;
   // String? play;
@@ -82,8 +83,9 @@ class SearchVideoItemModel {
     aid = json['aid'];
     bvid = json['bvid'];
     mid = json['mid'];
-    // title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
-    title = Em.regTitle(json['title']);
+    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    // title = Em.regTitle(json['title']);
+    titleList = Em.regTitle(json['title']);
     description = json['description'];
     pic = json['pic'] != null && json['pic'].startsWith('//')
         ? 'https:${json['pic']}'
@@ -232,6 +234,7 @@ class SearchLiveItemModel {
     this.userCover,
     this.type,
     this.title,
+    this.titleList,
     this.cover,
     this.pic,
     this.online,
@@ -251,7 +254,8 @@ class SearchLiveItemModel {
   String? face;
   String? userCover;
   String? type;
-  List? title;
+  String? title;
+  List? titleList;
   String? cover;
   String? pic;
   int? online;
@@ -272,7 +276,8 @@ class SearchLiveItemModel {
     face = json['uface'];
     userCover = json['user_cover'];
     type = json['type'];
-    title = Em.regTitle(json['title']);
+    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    titleList = Em.regTitle(json['title']);
     cover = json['cover'];
     pic = json['cover'];
     online = json['online'];
@@ -302,6 +307,7 @@ class SearchMBangumiItemModel {
     this.type,
     this.mediaId,
     this.title,
+    this.titleList,
     this.orgTitle,
     this.mediaType,
     this.cv,
@@ -328,7 +334,8 @@ class SearchMBangumiItemModel {
 
   String? type;
   int? mediaId;
-  List? title;
+  String? title;
+  List? titleList;
   String? orgTitle;
   int? mediaType;
   String? cv;
@@ -355,7 +362,8 @@ class SearchMBangumiItemModel {
   SearchMBangumiItemModel.fromJson(Map<String, dynamic> json) {
     type = json['type'];
     mediaId = json['media_id'];
-    title = Em.regTitle(json['title']);
+    title = json['title'].replaceAll(RegExp(r'<.*?>'), '');
+    titleList = Em.regTitle(json['title']);
     orgTitle = json['org_title'];
     mediaType = json['media_type'];
     cv = json['cv'];
diff --git a/lib/models/video/play/quality.dart b/lib/models/video/play/quality.dart
index 6cae84cc..7bedf62a 100644
--- a/lib/models/video/play/quality.dart
+++ b/lib/models/video/play/quality.dart
@@ -39,6 +39,14 @@ extension VideoQualityCode on VideoQuality {
     }
     return null;
   }
+
+  static int? toCode(VideoQuality quality) {
+    final index = VideoQuality.values.indexOf(quality);
+    if (index != -1 && index < _codeList.length) {
+      return _codeList[index];
+    }
+    return null;
+  }
 }
 
 extension VideoQualityDesc on VideoQuality {
diff --git a/lib/models/video_detail_res.dart b/lib/models/video_detail_res.dart
index 38e0b877..ae272375 100644
--- a/lib/models/video_detail_res.dart
+++ b/lib/models/video_detail_res.dart
@@ -67,6 +67,7 @@ class VideoDetailData {
   String? likeIcon;
   bool? needJumpBv;
   String? epId;
+  List<Staff>? staff;
 
   VideoDetailData({
     this.bvid,
@@ -103,6 +104,7 @@ class VideoDetailData {
     this.likeIcon,
     this.needJumpBv,
     this.epId,
+    this.staff,
   });
 
   VideoDetailData.fromJson(Map<String, dynamic> json) {
@@ -155,6 +157,9 @@ class VideoDetailData {
     if (json['redirect_url'] != null) {
       epId = resolveEpId(json['redirect_url']);
     }
+    staff = json["staff"] != null
+        ? List<Staff>.from(json["staff"]!.map((e) => Staff.fromJson(e)))
+        : null;
   }
 
   String resolveEpId(url) {
@@ -377,6 +382,7 @@ class Part {
   String? weblink;
   Dimension? dimension;
   String? firstFrame;
+  String? cover;
 
   Part({
     this.cid,
@@ -388,6 +394,7 @@ class Part {
     this.weblink,
     this.dimension,
     this.firstFrame,
+    this.cover,
   });
 
   fromRawJson(String str) => Part.fromJson(json.decode(str));
@@ -405,7 +412,8 @@ class Part {
     dimension = json["dimension"] == null
         ? null
         : Dimension.fromJson(json["dimension"]);
-    firstFrame = json["first_frame"];
+    firstFrame = json["first_frame"] ?? '';
+    cover = json["first_frame"] ?? '';
   }
 
   Map<String, dynamic> toJson() {
@@ -629,6 +637,7 @@ class EpisodeItem {
     this.attribute,
     this.page,
     this.bvid,
+    this.cover,
   });
   int? seasonId;
   int? sectionId;
@@ -639,6 +648,7 @@ class EpisodeItem {
   int? attribute;
   Part? page;
   String? bvid;
+  String? cover;
 
   EpisodeItem.fromJson(Map<String, dynamic> json) {
     seasonId = json['season_id'];
@@ -650,5 +660,46 @@ class EpisodeItem {
     attribute = json['attribute'];
     page = Part.fromJson(json['page']);
     bvid = json['bvid'];
+    cover = json['arc']['pic'];
+  }
+}
+
+class Staff {
+  Staff({
+    this.mid,
+    this.title,
+    this.name,
+    this.face,
+    this.vip,
+  });
+
+  int? mid;
+  String? title;
+  String? name;
+  String? face;
+  int? status;
+  Vip? vip;
+
+  Staff.fromJson(Map<String, dynamic> json) {
+    mid = json['mid'];
+    title = json['title'];
+    name = json['name'];
+    face = json['face'];
+    vip = Vip.fromJson(json['vip']);
+  }
+}
+
+class Vip {
+  Vip({
+    this.type,
+    this.status,
+  });
+
+  int? type;
+  int? status;
+
+  Vip.fromJson(Map<String, dynamic> json) {
+    type = json['type'];
+    status = json['status'];
   }
 }
diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart
index b381691a..81d3c3f4 100644
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -218,7 +218,7 @@ class AboutController extends GetxController {
   RxString currentVersion = ''.obs;
   RxString remoteVersion = ''.obs;
   late LatestDataModel remoteAppInfo;
-  RxBool isUpdate = true.obs;
+  RxBool isUpdate = false.obs;
   RxBool isLoading = true.obs;
   late LatestDataModel data;
 
diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/bangumi/introduction/controller.dart
index 2098302d..65cd5dd8 100644
--- a/lib/pages/bangumi/introduction/controller.dart
+++ b/lib/pages/bangumi/introduction/controller.dart
@@ -131,51 +131,37 @@ class BangumiIntroController extends GetxController {
         builder: (context) {
           return AlertDialog(
             title: const Text('选择投币个数'),
-            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
+            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
             content: StatefulBuilder(builder: (context, StateSetter setState) {
               return Column(
                 mainAxisSize: MainAxisSize.min,
-                children: [
-                  RadioListTile(
-                    value: 1,
-                    title: const Text('1枚'),
-                    groupValue: _tempThemeValue,
-                    onChanged: (value) {
-                      _tempThemeValue = value!;
-                      Get.appUpdate();
-                    },
-                  ),
-                  RadioListTile(
-                    value: 2,
-                    title: const Text('2枚'),
-                    groupValue: _tempThemeValue,
-                    onChanged: (value) {
-                      _tempThemeValue = value!;
-                      Get.appUpdate();
-                    },
-                  ),
-                ],
+                children: [1, 2]
+                    .map(
+                      (e) => RadioListTile(
+                        value: e,
+                        title: Text('$e枚'),
+                        groupValue: _tempThemeValue,
+                        onChanged: (value) async {
+                          _tempThemeValue = value!;
+                          setState(() {});
+                          var res = await VideoHttp.coinVideo(
+                              bvid: bvid, multiply: _tempThemeValue);
+                          if (res['status']) {
+                            SmartDialog.showToast('投币成功 👏');
+                            hasCoin.value = true;
+                            bangumiDetail.value.stat!['coins'] =
+                                bangumiDetail.value.stat!['coins'] +
+                                    _tempThemeValue;
+                          } else {
+                            SmartDialog.showToast(res['msg']);
+                          }
+                          Get.back();
+                        },
+                      ),
+                    )
+                    .toList(),
               );
             }),
-            actions: [
-              TextButton(onPressed: () => Get.back(), child: const Text('取消')),
-              TextButton(
-                onPressed: () async {
-                  var res = await VideoHttp.coinVideo(
-                      bvid: bvid, multiply: _tempThemeValue);
-                  if (res['status']) {
-                    SmartDialog.showToast('投币成功 👏');
-                    hasCoin.value = true;
-                    bangumiDetail.value.stat!['coins'] =
-                        bangumiDetail.value.stat!['coins'] + _tempThemeValue;
-                  } else {
-                    SmartDialog.showToast(res['msg']);
-                  }
-                  Get.back();
-                },
-                child: const Text('确定'),
-              )
-            ],
           );
         });
   }
@@ -229,13 +215,15 @@ class BangumiIntroController extends GetxController {
   }
 
   // 修改分P或番剧分集
-  Future changeSeasonOrbangu(bvid, cid, aid) async {
+  Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
     // 重新获取视频资源
     VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
     videoDetailCtr.bvid = bvid;
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
+    videoDetailCtr.oid.value = aid;
+    videoDetailCtr.cover.value = cover;
     videoDetailCtr.queryVideoUrl();
     // 重新请求评论
     try {
@@ -294,7 +282,8 @@ class BangumiIntroController extends GetxController {
     int cid = episodes[nextIndex].cid!;
     String bvid = episodes[nextIndex].bvid!;
     int aid = episodes[nextIndex].aid!;
-    changeSeasonOrbangu(bvid, cid, aid);
+    String cover = episodes[nextIndex].cover!;
+    changeSeasonOrbangu(bvid, cid, aid, cover);
   }
 
   // 播放器底栏 选集 回调
@@ -315,7 +304,7 @@ class BangumiIntroController extends GetxController {
         sheetHeight: Get.size.height,
         isFullScreen: true,
         changeFucCall: (item, index) {
-          changeSeasonOrbangu(item.bvid, item.cid, item.aid);
+          changeSeasonOrbangu(item.bvid, item.cid, item.aid, item.cover);
           SmartDialog.dismiss();
         },
       ).buildShowContent(Get.context!),
diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart
index e47db480..bb85be1a 100644
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@@ -194,7 +194,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                     src: widget.bangumiDetail!.cover!,
                   ),
                   PBadge(
-                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
+                    text:
+                        '评分 ${widget.bangumiDetail?.rating?['score']! ?? '暂无'}',
                     top: null,
                     right: 6,
                     bottom: 6,
@@ -231,11 +232,11 @@ class _BangumiInfoState extends State<BangumiInfo> {
                               height: 34,
                               child: IconButton(
                                 style: ButtonStyle(
-                                  padding: MaterialStateProperty.all(
-                                      EdgeInsets.zero),
+                                  padding:
+                                      WidgetStateProperty.all(EdgeInsets.zero),
                                   backgroundColor:
-                                      MaterialStateProperty.resolveWith(
-                                          (Set<MaterialState> states) {
+                                      WidgetStateProperty.resolveWith(
+                                          (Set<WidgetState> states) {
                                     return t.colorScheme.primaryContainer
                                         .withOpacity(0.7);
                                   }),
@@ -322,8 +323,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
               pages: widget.bangumiDetail!.episodes!,
               cid: cid! ?? widget.bangumiDetail!.episodes!.first.cid!,
               sheetHeight: sheetHeight,
-              changeFuc: (bvid, cid, aid) =>
-                  bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
+              changeFuc: (bvid, cid, aid, cover) => bangumiIntroController
+                  .changeSeasonOrbangu(bvid, cid, aid, cover),
               bangumiDetail: bangumiIntroController.bangumiDetail.value,
               bangumiIntroController: bangumiIntroController,
             )
diff --git a/lib/pages/bangumi/introduction/widgets/intro_detail.dart b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
index c5bbd566..07684a86 100644
--- a/lib/pages/bangumi/introduction/widgets/intro_detail.dart
+++ b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
@@ -20,10 +20,10 @@ class IntroDetail extends StatelessWidget {
     sheetHeight = localCache.get('sheetHeight');
     TextStyle smallTitle = TextStyle(
       fontSize: 12,
-      color: Theme.of(context).colorScheme.onBackground,
+      color: Theme.of(context).colorScheme.onSurface,
     );
     return Container(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       padding: const EdgeInsets.only(left: 14, right: 14),
       height: sheetHeight,
       child: Column(
diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart
index 8759af65..3adfdc1f 100644
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/utils/main_stream.dart';
@@ -142,10 +141,10 @@ class _BangumiPageState extends State<BangumiPage>
                                       ),
                               );
                             } else {
-                              return nil;
+                              return const SizedBox();
                             }
                           } else {
-                            return nil;
+                            return const SizedBox();
                           }
                         },
                       ),
@@ -216,7 +215,7 @@ class _BangumiPageState extends State<BangumiPage>
         (BuildContext context, int index) {
           return bangumiList!.isNotEmpty
               ? BangumiCardV(bangumiItem: bangumiList[index])
-              : nil;
+              : const SizedBox();
         },
         childCount: bangumiList!.isNotEmpty ? bangumiList!.length : 10,
       ),
diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/bangumi/widgets/bangumi_panel.dart
index b01f3be7..345a47b6 100644
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@@ -84,9 +84,12 @@ class _BangumiPanelState extends State<BangumiPanel> {
       item.bvid,
       item.cid,
       item.aid,
+      item.cover,
     );
-    _bottomSheetController?.close();
-    currentIndex = i;
+    if (_bottomSheetController != null) {
+      _bottomSheetController?.close();
+    }
+    currentIndex.value = i;
     scrollToIndex();
   }
 
@@ -136,7 +139,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                 height: 34,
                 child: TextButton(
                   style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
                   ),
                   onPressed: () {
                     widget.bangumiIntroController?.bottomSheetController =
diff --git a/lib/pages/bangumi/widgets/bangumu_card_v.dart b/lib/pages/bangumi/widgets/bangumu_card_v.dart
index c1233ddf..a1d7a931 100644
--- a/lib/pages/bangumi/widgets/bangumu_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/http/search.dart';
-import 'package:pilipala/models/bangumi/info.dart';
-import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/models/bangumi/list.dart';
+import 'package:pilipala/utils/image_save.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 
@@ -14,109 +13,67 @@ class BangumiCardV extends StatelessWidget {
   const BangumiCardV({
     super.key,
     required this.bangumiItem,
-    this.longPress,
-    this.longPressEnd,
   });
 
-  final bangumiItem;
-  final Function()? longPress;
-  final Function()? longPressEnd;
+  final BangumiListItemModel bangumiItem;
 
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(bangumiItem.mediaId);
-    return Card(
-      elevation: 0,
-      clipBehavior: Clip.hardEdge,
-      margin: EdgeInsets.zero,
-      child: GestureDetector(
-        // onLongPress: () {
-        //   if (longPress != null) {
-        //     longPress!();
-        //   }
-        // },
-        // onLongPressEnd: (details) {
-        //   if (longPressEnd != null) {
-        //     longPressEnd!();
-        //   }
-        // },
-        child: InkWell(
-          onTap: () async {
-            final int seasonId = bangumiItem.seasonId;
-            SmartDialog.showLoading(msg: '获取中...');
-            final res = await SearchHttp.bangumiInfo(seasonId: seasonId);
-            SmartDialog.dismiss().then((value) {
-              if (res['status']) {
-                if (res['data'].episodes.isEmpty) {
-                  SmartDialog.showToast('资源加载失败');
-                  return;
-                }
-                EpisodeItem episode = res['data'].episodes.first;
-                String bvid = episode.bvid!;
-                int cid = episode.cid!;
-                String pic = episode.cover!;
-                String heroTag = Utils.makeHeroTag(cid);
-                Get.toNamed(
-                  '/video?bvid=$bvid&cid=$cid&seasonId=$seasonId',
-                  arguments: {
-                    'pic': pic,
-                    'heroTag': heroTag,
-                    'videoType': SearchType.media_bangumi,
-                    'bangumiItem': res['data'],
-                  },
+    return InkWell(
+      onTap: () {
+        RoutePush.bangumiPush(
+          bangumiItem.seasonId,
+          null,
+          heroTag: heroTag,
+        );
+      },
+      onLongPress: () =>
+          imageSaveDialog(context, bangumiItem, SmartDialog.dismiss),
+      child: Column(
+        children: [
+          ClipRRect(
+            borderRadius: const BorderRadius.all(
+              StyleString.imgRadius,
+            ),
+            child: AspectRatio(
+              aspectRatio: 0.65,
+              child: LayoutBuilder(builder: (context, boxConstraints) {
+                final double maxWidth = boxConstraints.maxWidth;
+                final double maxHeight = boxConstraints.maxHeight;
+                return Stack(
+                  children: [
+                    Hero(
+                      tag: heroTag,
+                      child: NetworkImgLayer(
+                        src: bangumiItem.cover,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                    ),
+                    if (bangumiItem.badge != null)
+                      PBadge(
+                          text: bangumiItem.badge,
+                          top: 6,
+                          right: 6,
+                          bottom: null,
+                          left: null),
+                    if (bangumiItem.order != null)
+                      PBadge(
+                        text: bangumiItem.order,
+                        top: null,
+                        right: null,
+                        bottom: 6,
+                        left: 6,
+                        type: 'gray',
+                      ),
+                  ],
                 );
-              }
-            });
-          },
-          child: Column(
-            children: [
-              ClipRRect(
-                borderRadius: const BorderRadius.only(
-                  topLeft: StyleString.imgRadius,
-                  topRight: StyleString.imgRadius,
-                  bottomLeft: StyleString.imgRadius,
-                  bottomRight: StyleString.imgRadius,
-                ),
-                child: AspectRatio(
-                  aspectRatio: 0.65,
-                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    final double maxWidth = boxConstraints.maxWidth;
-                    final double maxHeight = boxConstraints.maxHeight;
-                    return Stack(
-                      children: [
-                        Hero(
-                          tag: heroTag,
-                          child: NetworkImgLayer(
-                            src: bangumiItem.cover,
-                            width: maxWidth,
-                            height: maxHeight,
-                          ),
-                        ),
-                        if (bangumiItem.badge != null)
-                          PBadge(
-                              text: bangumiItem.badge,
-                              top: 6,
-                              right: 6,
-                              bottom: null,
-                              left: null),
-                        if (bangumiItem.order != null)
-                          PBadge(
-                            text: bangumiItem.order,
-                            top: null,
-                            right: null,
-                            bottom: 6,
-                            left: 6,
-                            type: 'gray',
-                          ),
-                      ],
-                    );
-                  }),
-                ),
-              ),
-              BangumiContent(bangumiItem: bangumiItem)
-            ],
+              }),
+            ),
           ),
-        ),
+          BangumiContent(bangumiItem: bangumiItem)
+        ],
       ),
     );
   }
diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart
index b7676663..9bed3685 100644
--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@@ -14,6 +14,7 @@ import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -70,7 +71,7 @@ class DynamicsController extends GetxController {
 
   Future queryFollowDynamic({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (type == 'init') {
       dynamicsList.clear();
@@ -220,25 +221,7 @@ class DynamicsController extends GetxController {
         print('DYNAMIC_TYPE_PGC_UNION 番剧');
         DynamicArchiveModel pgc = item.modules.moduleDynamic.major.pgc;
         if (pgc.epid != null) {
-          SmartDialog.showLoading(msg: '获取中...');
-          var res = await SearchHttp.bangumiInfo(epId: pgc.epid);
-          SmartDialog.dismiss();
-          if (res['status']) {
-            EpisodeItem episode = res['data'].episodes.first;
-            String bvid = episode.bvid!;
-            int cid = episode.cid!;
-            String pic = episode.cover!;
-            String heroTag = Utils.makeHeroTag(cid);
-            Get.toNamed(
-              '/video?bvid=$bvid&cid=$cid&seasonId=${res['data'].seasonId}',
-              arguments: {
-                'pic': pic,
-                'heroTag': heroTag,
-                'videoType': SearchType.media_bangumi,
-                'bangumiItem': res['data'],
-              },
-            );
-          }
+          RoutePush.bangumiPush(null, pgc.epid);
         }
         break;
     }
@@ -246,7 +229,7 @@ class DynamicsController extends GetxController {
 
   Future queryFollowUp({type = 'init'}) async {
     if (!userLogin.value) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (type == 'init') {
       upData.value.upList = <UpItem>[];
diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics/detail/controller.dart
index 8e117383..f34de061 100644
--- a/lib/pages/dynamics/detail/controller.dart
+++ b/lib/pages/dynamics/detail/controller.dart
@@ -25,6 +25,7 @@ class DynamicDetailController extends GetxController {
   RxString sortTypeTitle = ReplySortType.time.titles.obs;
   RxString sortTypeLabel = ReplySortType.time.labels.obs;
   Box setting = GStrorage.setting;
+  RxInt replyReqCode = 200.obs;
 
   @override
   void onInit() {
@@ -84,6 +85,7 @@ class DynamicDetailController extends GetxController {
         replyList.addAll(replies);
       }
     }
+    replyReqCode.value = res['code'];
     isLoadingMore = false;
     return res;
   }
diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart
index c6ec682a..e83b5547 100644
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -196,7 +196,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         centerTitle: false,
         titleSpacing: 0,
         title: StreamBuilder(
-          stream: titleStreamC.stream.distinct(),
+          stream: titleStreamC.stream,
           initialData: false,
           builder: (context, AsyncSnapshot snapshot) {
             return AnimatedOpacity(
@@ -369,35 +369,40 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
             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[replyType],
-                );
-              },
-            ).then(
-              (value) => {
-                // 完成评论，数据添加
-                if (value != null && value['data'] != null)
-                  {
-                    _dynamicDetailController.replyList.add(value['data']),
-                    _dynamicDetailController.acount.value++
-                  }
-              },
-            );
-          },
-          tooltip: '评论动态',
-          child: const Icon(Icons.reply),
+        child: Obx(
+          () => _dynamicDetailController.replyReqCode.value == 12061
+              ? const SizedBox()
+              : 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[replyType],
+                        );
+                      },
+                    ).then(
+                      (value) => {
+                        // 完成评论，数据添加
+                        if (value != null && value['data'] != null)
+                          {
+                            _dynamicDetailController.replyList
+                                .add(value['data']),
+                            _dynamicDetailController.acount.value++
+                          }
+                      },
+                    );
+                  },
+                  tooltip: '评论动态',
+                  child: const Icon(Icons.reply),
+                ),
         ),
       ),
     );
diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index 82a555b1..258ad531 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -11,6 +11,7 @@ import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/main_stream.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../mine/controller.dart';
@@ -161,13 +162,12 @@ class _DynamicsPageState extends State<DynamicsPage>
                                 decoration: BoxDecoration(
                                   color: Theme.of(context)
                                       .colorScheme
-                                      .surfaceVariant
+                                      .surfaceContainerHighest
                                       .withOpacity(0.7),
                                   borderRadius: BorderRadius.circular(20),
                                 ),
                                 thumbDecoration: BoxDecoration(
-                                  color:
-                                      Theme.of(context).colorScheme.background,
+                                  color: Theme.of(context).colorScheme.surface,
                                   borderRadius: BorderRadius.circular(20),
                                 ),
                                 duration: const Duration(milliseconds: 300),
@@ -224,8 +224,8 @@ class _DynamicsPageState extends State<DynamicsPage>
                   if (snapshot.data == null) {
                     return const SliverToBoxAdapter(child: SizedBox());
                   }
-                  Map data = snapshot.data;
-                  if (data['status']) {
+                  Map? data = snapshot.data;
+                  if (data != null && data['status']) {
                     List<DynamicItemModel> list =
                         _dynamicsController.dynamicsList;
                     return Obx(
@@ -248,24 +248,21 @@ class _DynamicsPageState extends State<DynamicsPage>
                         }
                       },
                     );
-                  } else if (data['msg'] == "账号未登录") {
-                    return HttpError(
-                      errMsg: data['msg'],
-                      btnText: "去登录",
-                      fn: () {
-                        mineController.onLogin();
-                      },
-                    );
                   } else {
                     return HttpError(
-                      errMsg: data['msg'],
+                      errMsg: data?['msg'] ?? '请求异常',
+                      btnText: data?['code'] == -101 ? '去登录' : null,
                       fn: () {
-                        setState(() {
-                          _futureBuilderFuture =
-                              _dynamicsController.queryFollowDynamic();
-                          _futureBuilderFutureUp =
-                              _dynamicsController.queryFollowUp();
-                        });
+                        if (data?['code'] == -101) {
+                          RoutePush.loginRedirectPush();
+                        } else {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _dynamicsController.queryFollowDynamic();
+                            _futureBuilderFutureUp =
+                                _dynamicsController.queryFollowUp();
+                          });
+                        }
                       },
                     );
                   }
diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart
index 0e67b0a7..51ef3952 100644
--- a/lib/pages/dynamics/widgets/action_panel.dart
+++ b/lib/pages/dynamics/widgets/action_panel.dart
@@ -14,10 +14,10 @@ import 'rich_node_panel.dart';
 class ActionPanel extends StatefulWidget {
   const ActionPanel({
     super.key,
-    this.item,
+    required this.item,
   });
   // ignore: prefer_typing_uninitialized_variables
-  final item;
+  final DynamicItemModel item;
 
   @override
   State<ActionPanel> createState() => _ActionPanelState();
@@ -28,7 +28,8 @@ class _ActionPanelState extends State<ActionPanel>
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
   late ModuleStatModel stat;
   bool isProcessing = false;
-  RxDouble height = (310.0).obs;
+  double defaultHeight = 260;
+  RxDouble height = 0.0.obs;
   RxBool isExpand = false.obs;
   late double statusHeight;
   TextEditingController _inputController = TextEditingController();
@@ -48,7 +49,7 @@ class _ActionPanelState extends State<ActionPanel>
   @override
   void initState() {
     super.initState();
-    stat = widget.item!.modules.moduleStat;
+    stat = widget.item.modules!.moduleStat!;
     onInit();
   }
 
@@ -62,7 +63,7 @@ class _ActionPanelState extends State<ActionPanel>
     var item = widget.item!;
     String dynamicId = item.idStr!;
     // 1 已点赞 2 不喜欢 0 未操作
-    Like like = item.modules.moduleStat.like;
+    Like like = item.modules!.moduleStat!.like!;
     int count = like.count == '点赞' ? 0 : int.parse(like.count ?? '0');
     bool status = like.status!;
     int up = status ? 2 : 1;
@@ -70,15 +71,15 @@ class _ActionPanelState extends State<ActionPanel>
     if (res['status']) {
       SmartDialog.showToast(!status ? '点赞成功' : '取消赞');
       if (up == 1) {
-        item.modules.moduleStat.like.count = (count + 1).toString();
-        item.modules.moduleStat.like.status = true;
+        item.modules!.moduleStat!.like!.count = (count + 1).toString();
+        item.modules!.moduleStat!.like!.status = true;
       } else {
         if (count == 1) {
-          item.modules.moduleStat.like.count = '点赞';
+          item.modules!.moduleStat!.like!.count = '点赞';
         } else {
-          item.modules.moduleStat.like.count = (count - 1).toString();
+          item.modules!.moduleStat!.like!.count = (count - 1).toString();
         }
-        item.modules.moduleStat.like.status = false;
+        item.modules!.moduleStat!.like!.status = false;
       }
       setState(() {});
     } else {
@@ -88,50 +89,134 @@ class _ActionPanelState extends State<ActionPanel>
 
   // 转发动态预览
   Widget dynamicPreview() {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(12, 0, 14, 12),
-      child: Container(
-        width: double.infinity,
-        decoration: BoxDecoration(
-          color:
-              Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4),
-          borderRadius: BorderRadius.circular(12),
+    ItemModulesModel? modules = widget.item.modules;
+    final String type = widget.item.type!;
+    String? cover = modules?.moduleAuthor?.face;
+    switch (type) {
+      /// 图文动态
+      case 'DYNAMIC_TYPE_DRAW':
+        cover = modules?.moduleDynamic?.major?.opus?.pics?.first.url;
+
+      /// 投稿
+      case 'DYNAMIC_TYPE_AV':
+        cover = modules?.moduleDynamic?.major?.archive?.cover;
+
+      /// 转发的动态
+      case 'DYNAMIC_TYPE_FORWARD':
+        String forwardType = widget.item.orig!.type!;
+        switch (forwardType) {
+          /// 图文动态
+          case 'DYNAMIC_TYPE_DRAW':
+            cover = modules?.moduleDynamic?.major?.opus?.pics?.first.url;
+
+          /// 投稿
+          case 'DYNAMIC_TYPE_AV':
+            cover = modules?.moduleDynamic?.major?.archive?.cover;
+
+          /// 专栏文章
+          case 'DYNAMIC_TYPE_ARTICLE':
+            cover = '';
+
+          /// 番剧
+          case 'DYNAMIC_TYPE_PGC':
+            cover = '';
+
+          /// 纯文字动态
+          case 'DYNAMIC_TYPE_WORD':
+            cover = '';
+
+          /// 直播
+          case 'DYNAMIC_TYPE_LIVE_RCMD':
+            cover = '';
+
+          /// 合集查看
+          case 'DYNAMIC_TYPE_UGC_SEASON':
+            cover = '';
+
+          /// 番剧
+          case 'DYNAMIC_TYPE_PGC_UNION':
+            cover = modules?.moduleDynamic?.major?.pgc?.cover;
+
+          default:
+            cover = '';
+        }
+
+      /// 专栏文章
+      case 'DYNAMIC_TYPE_ARTICLE':
+        cover = '';
+
+      /// 番剧
+      case 'DYNAMIC_TYPE_PGC':
+        cover = '';
+
+      /// 纯文字动态
+      case 'DYNAMIC_TYPE_WORD':
+        cover = '';
+
+      /// 直播
+      case 'DYNAMIC_TYPE_LIVE_RCMD':
+        cover = '';
+
+      /// 合集查看
+      case 'DYNAMIC_TYPE_UGC_SEASON':
+        cover = '';
+
+      /// 番剧查看
+      case 'DYNAMIC_TYPE_PGC_UNION':
+        cover = '';
+
+      default:
+        cover = '';
+    }
+    return Container(
+      width: double.infinity,
+      height: 95,
+      margin: const EdgeInsets.fromLTRB(12, 0, 12, 14),
+      decoration: BoxDecoration(
+        color:
+            Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4),
+        borderRadius: BorderRadius.circular(6),
+        border: Border(
+          left: BorderSide(
+              width: 4,
+              color: Theme.of(context).colorScheme.primary.withOpacity(0.8)),
         ),
-        child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 14),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              '@${widget.item.modules!.moduleAuthor!.name}',
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.primary,
+              ),
+            ),
+            const SizedBox(height: 8),
+            Row(
               children: [
-                Text(
-                  '@${widget.item.modules.moduleAuthor.name}',
-                  style: TextStyle(
-                    color: Theme.of(context).colorScheme.primary,
+                NetworkImgLayer(
+                  src: cover ?? '',
+                  width: 34,
+                  height: 34,
+                  type: 'emote',
+                ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Text.rich(
+                    style: const TextStyle(height: 0),
+                    richNode(widget.item, context),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
                   ),
                 ),
-                const SizedBox(height: 6),
-                Row(
-                  children: [
-                    NetworkImgLayer(
-                      src: widget.item.modules.moduleAuthor.face,
-                      width: 34,
-                      height: 34,
-                      type: 'emote',
-                    ),
-                    const SizedBox(width: 10),
-                    Expanded(
-                      child: Text.rich(
-                        style: const TextStyle(height: 0),
-                        richNode(widget.item, context),
-                        maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    // Text(data)
-                  ],
-                )
+                // Text(data)
               ],
-            )),
+            )
+          ],
+        ),
       ),
     );
   }
@@ -149,56 +234,54 @@ class _ActionPanelState extends State<ActionPanel>
             duration: Durations.medium1,
             onEnd: () async {
               if (isExpand.value) {
-                await Future.delayed(const Duration(milliseconds: 120));
+                await Future.delayed(const Duration(milliseconds: 80));
                 myFocusNode.requestFocus();
               }
             },
-            height: height.value,
+            height: height.value + MediaQuery.of(context).padding.bottom,
             child: Column(
-              mainAxisSize: MainAxisSize.min,
               children: [
                 AnimatedContainer(
                   duration: Durations.medium1,
                   height: isExpand.value ? statusHeight : 0,
                 ),
                 Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 10, 12, 0),
+                  padding: EdgeInsets.fromLTRB(
+                    isExpand.value ? 10 : 16,
+                    10,
+                    isExpand.value ? 14 : 12,
+                    0,
+                  ),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      AnimatedSwitcher(
-                        duration: Durations.medium1,
-                        transitionBuilder:
-                            (Widget child, Animation<double> animation) {
-                          return ScaleTransition(
-                              scale: animation, child: child);
-                        },
-                        child: isExpand.value
-                            ? IconButton(
-                                onPressed: () => togglePanelState(false),
-                                icon: const Icon(Icons.close))
-                            : const Text(
-                                '转发动态',
-                                style: TextStyle(fontWeight: FontWeight.bold),
-                              ),
-                      ),
-                      AnimatedSwitcher(
-                        duration: Durations.medium1,
-                        transitionBuilder:
-                            (Widget child, Animation<double> animation) {
-                          return ScaleTransition(
-                              scale: animation, child: child);
-                        },
-                        child: isExpand.value
-                            ? FilledButton(
-                                onPressed: () => dynamicForward('forward'),
-                                child: const Text('转发'),
-                              )
-                            : TextButton(
-                                onPressed: () {},
-                                child: const Text('立即转发'),
-                              ),
-                      ),
+                      if (isExpand.value) ...[
+                        IconButton(
+                          onPressed: () => togglePanelState(false),
+                          icon: const Icon(Icons.close),
+                        ),
+                        Text(
+                          '转发动态',
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(fontWeight: FontWeight.bold),
+                        )
+                      ] else ...[
+                        const Text(
+                          '转发动态',
+                          style: TextStyle(fontWeight: FontWeight.bold),
+                        )
+                      ],
+                      isExpand.value
+                          ? FilledButton(
+                              onPressed: () => dynamicForward('forward'),
+                              child: const Text('转发'),
+                            )
+                          : TextButton(
+                              onPressed: () {},
+                              child: const Text('立即转发'),
+                            )
                     ],
                   ),
                 ),
@@ -209,7 +292,7 @@ class _ActionPanelState extends State<ActionPanel>
                     child: Container(
                       width: double.infinity,
                       alignment: Alignment.centerLeft,
-                      padding: const EdgeInsets.fromLTRB(16, 0, 10, 15),
+                      padding: const EdgeInsets.fromLTRB(16, 0, 10, 14),
                       child: Text(
                         '说点什么吧',
                         textAlign: TextAlign.start,
@@ -251,9 +334,6 @@ class _ActionPanelState extends State<ActionPanel>
                       textAlign: TextAlign.center,
                     ),
                   ),
-                  SizedBox(
-                    height: MediaQuery.of(context).padding.bottom + 20,
-                  )
                 ]
               ],
             ),
@@ -266,7 +346,7 @@ class _ActionPanelState extends State<ActionPanel>
   togglePanelState(status) {
     if (!status) {
       Get.back();
-      height.value = 310;
+      height.value = defaultHeight;
       _inputText = '';
       _inputController.clear();
     } else {
@@ -281,6 +361,7 @@ class _ActionPanelState extends State<ActionPanel>
       dynIdStr: dynamicId,
       mid: _dynamicsController.userInfo.mid,
       rawText: _inputText,
+      scene: 4,
     );
     if (res['status']) {
       SmartDialog.showToast(type == 'forward' ? '转发成功' : '发布成功');
@@ -298,6 +379,8 @@ class _ActionPanelState extends State<ActionPanel>
   Widget build(BuildContext context) {
     var color = Theme.of(context).colorScheme.outline;
     var primary = Theme.of(context).colorScheme.primary;
+    height.value = defaultHeight;
+    print('height.value: ${height.value}');
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceAround,
       children: [
diff --git a/lib/pages/dynamics/widgets/additional_panel.dart b/lib/pages/dynamics/widgets/additional_panel.dart
index fa11f217..50e1b6d3 100644
--- a/lib/pages/dynamics/widgets/additional_panel.dart
+++ b/lib/pages/dynamics/widgets/additional_panel.dart
@@ -19,7 +19,7 @@ Widget addWidget(item, context, type, {floor = 1}) {
   };
   Color bgColor = floor == 1
       ? Theme.of(context).dividerColor.withOpacity(0.08)
-      : Theme.of(context).colorScheme.background;
+      : Theme.of(context).colorScheme.surface;
   switch (type) {
     case 'ADDITIONAL_TYPE_UGC':
       // 转发的投稿
diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart
index 0d3baecd..e66e2a91 100644
--- a/lib/pages/dynamics/widgets/author_panel.dart
+++ b/lib/pages/dynamics/widgets/author_panel.dart
@@ -52,7 +52,7 @@ class AuthorPanel extends StatelessWidget {
                     color: item.modules.moduleAuthor!.vip != null &&
                             item.modules.moduleAuthor!.vip['status'] > 0
                         ? const Color.fromARGB(255, 251, 100, 163)
-                        : Theme.of(context).colorScheme.onBackground,
+                        : Theme.of(context).colorScheme.onSurface,
                     fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
                   ),
                 ),
@@ -82,7 +82,7 @@ class AuthorPanel extends StatelessWidget {
             height: 32,
             child: IconButton(
               style: ButtonStyle(
-                padding: MaterialStateProperty.all(EdgeInsets.zero),
+                padding: WidgetStateProperty.all(EdgeInsets.zero),
               ),
               onPressed: () {
                 showModalBottomSheet(
diff --git a/lib/pages/dynamics/widgets/dynamic_panel.dart b/lib/pages/dynamics/widgets/dynamic_panel.dart
index c85cad45..cc5dcbb1 100644
--- a/lib/pages/dynamics/widgets/dynamic_panel.dart
+++ b/lib/pages/dynamics/widgets/dynamic_panel.dart
@@ -9,7 +9,7 @@ import 'forward_panel.dart';
 class DynamicPanel extends StatelessWidget {
   final dynamic item;
   final String? source;
-  DynamicPanel({this.item, this.source, Key? key}) : super(key: key);
+  DynamicPanel({required this.item, this.source, Key? key}) : super(key: key);
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
 
   @override
@@ -41,8 +41,8 @@ class DynamicPanel extends StatelessWidget {
                 padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
                 child: AuthorPanel(item: item),
               ),
-              if (item!.modules!.moduleDynamic!.desc != null ||
-                  item!.modules!.moduleDynamic!.major != null)
+              if (item.modules!.moduleDynamic!.desc != null ||
+                  item.modules!.moduleDynamic!.major != null)
                 Content(item: item, source: source),
               forWard(item, context, _dynamicsController, source),
               const SizedBox(height: 2),
diff --git a/lib/pages/dynamics/widgets/forward_panel.dart b/lib/pages/dynamics/widgets/forward_panel.dart
index 5a8d9f17..f8b90a81 100644
--- a/lib/pages/dynamics/widgets/forward_panel.dart
+++ b/lib/pages/dynamics/widgets/forward_panel.dart
@@ -2,6 +2,7 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/utils/utils.dart';
 
 import 'additional_panel.dart';
@@ -182,6 +183,116 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
           )
         ],
       );
+    // 活动
+    case 'DYNAMIC_TYPE_COMMON_SQUARE':
+      return Padding(
+        padding: const EdgeInsets.only(top: 8),
+        child: InkWell(
+          onTap: () {
+            Get.toNamed('/webview', parameters: {
+              'url': item.modules.moduleDynamic.major.common['jump_url'],
+              'type': 'url',
+              'pageTitle': item.modules.moduleDynamic.major.common['title']
+            });
+          },
+          child: Container(
+            width: double.infinity,
+            padding:
+                const EdgeInsets.only(left: 12, top: 10, right: 12, bottom: 10),
+            color: Theme.of(context).dividerColor.withOpacity(0.08),
+            child: Row(
+              children: [
+                NetworkImgLayer(
+                  width: 45,
+                  height: 45,
+                  src: item.modules.moduleDynamic.major.common['cover'],
+                ),
+                const SizedBox(width: 10),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      item.modules.moduleDynamic.major.common['title'],
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      item.modules.moduleDynamic.major.common['desc'],
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.outline,
+                        fontSize:
+                            Theme.of(context).textTheme.labelMedium!.fontSize,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ],
+                )
+              ],
+            ),
+            // TextButton(onPressed: () {}, child: Text('123'))
+          ),
+        ),
+      );
+    case 'DYNAMIC_TYPE_MUSIC':
+      final Map music = item.modules.moduleDynamic.major.music;
+      return Padding(
+        padding: const EdgeInsets.only(top: 8),
+        child: InkWell(
+          onTap: () {
+            Get.toNamed('/webview', parameters: {
+              'url': "https:${music['jump_url']}",
+              'type': 'url',
+              'pageTitle': music['title']
+            });
+          },
+          child: Container(
+            width: double.infinity,
+            padding:
+                const EdgeInsets.only(left: 12, top: 10, right: 12, bottom: 10),
+            color: Theme.of(context).dividerColor.withOpacity(0.08),
+            child: Row(
+              children: [
+                NetworkImgLayer(
+                  width: 45,
+                  height: 45,
+                  src: music['cover'],
+                ),
+                const SizedBox(width: 10),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      music['title'],
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.primary,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      music['label'],
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.outline,
+                        fontSize:
+                            Theme.of(context).textTheme.labelMedium!.fontSize,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ],
+                )
+              ],
+            ),
+            // TextButton(onPressed: () {}, child: Text('123'))
+          ),
+        ),
+      );
     default:
       return const SizedBox(
         width: double.infinity,
diff --git a/lib/pages/dynamics/widgets/up_panel.dart b/lib/pages/dynamics/widgets/up_panel.dart
index fd0ae642..f8c973a0 100644
--- a/lib/pages/dynamics/widgets/up_panel.dart
+++ b/lib/pages/dynamics/widgets/up_panel.dart
@@ -1,3 +1,4 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@@ -30,6 +31,31 @@ class _UpPanelState extends State<UpPanel> {
     liveList = widget.upData.liveList!;
   }
 
+  void onClickUp(data, i) {
+    currentMid = data.mid;
+    Get.find<DynamicsController>().mid.value = data.mid;
+    Get.find<DynamicsController>().upInfo.value = data;
+    Get.find<DynamicsController>().onSelectUp(data.mid);
+    int liveLen = liveList.length;
+    int upLen = upList.length;
+    double itemWidth = contentWidth + itemPadding.horizontal;
+    double screenWidth = MediaQuery.sizeOf(context).width;
+    double moveDistance = 0.0;
+    if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
+    } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
+      moveDistance = (i + liveLen + 0.5) * itemWidth + 46 - screenWidth / 2;
+    } else {
+      moveDistance = (upLen + liveLen) * itemWidth + 46 - screenWidth;
+    }
+    data.hasUpdate = false;
+    scrollController.animateTo(
+      moveDistance,
+      duration: const Duration(milliseconds: 200),
+      curve: Curves.linear,
+    );
+    setState(() {});
+  }
+
   @override
   Widget build(BuildContext context) {
     listFormat();
@@ -43,7 +69,7 @@ class _UpPanelState extends State<UpPanel> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Container(
-                color: Theme.of(context).colorScheme.background,
+                color: Theme.of(context).colorScheme.surface,
                 padding: const EdgeInsets.only(left: 16, right: 16),
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -69,7 +95,7 @@ class _UpPanelState extends State<UpPanel> {
               ),
               Container(
                 height: 90,
-                color: Theme.of(context).colorScheme.background,
+                color: Theme.of(context).colorScheme.surface,
                 child: Row(
                   children: [
                     Flexible(
@@ -120,30 +146,10 @@ class _UpPanelState extends State<UpPanel> {
       onTap: () {
         feedBack();
         if (data.type == 'up') {
-          currentMid = data.mid;
-          Get.find<DynamicsController>().mid.value = data.mid;
-          Get.find<DynamicsController>().upInfo.value = data;
-          Get.find<DynamicsController>().onSelectUp(data.mid);
-          int liveLen = liveList.length;
-          int upLen = upList.length;
-          double itemWidth = contentWidth + itemPadding.horizontal;
-          double screenWidth = MediaQuery.sizeOf(context).width;
-          double moveDistance = 0.0;
-          if (itemWidth * (upList.length + liveList.length) <= screenWidth) {
-          } else if ((upLen - i - 0.5) * itemWidth > screenWidth / 2) {
-            moveDistance =
-                (i + liveLen + 0.5) * itemWidth + 46 - screenWidth / 2;
-          } else {
-            moveDistance = (upLen + liveLen) * itemWidth + 46 - screenWidth;
-          }
-          data.hasUpdate = false;
-          scrollController.animateTo(
-            moveDistance,
-            duration: const Duration(milliseconds: 500),
-            curve: Curves.easeInOut,
-          );
-
-          setState(() {});
+          EasyThrottle.throttle('follow', const Duration(milliseconds: 300),
+              () {
+            onClickUp(data, i);
+          });
         } else if (data.type == 'live') {
           LiveItemModel liveItem = LiveItemModel.fromJson({
             'title': data.title,
diff --git a/lib/pages/dynamics/widgets/video_panel.dart b/lib/pages/dynamics/widgets/video_panel.dart
index 32a6e21c..828fb283 100644
--- a/lib/pages/dynamics/widgets/video_panel.dart
+++ b/lib/pages/dynamics/widgets/video_panel.dart
@@ -80,14 +80,11 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) {
         double width = box.maxWidth;
         return Stack(
           children: [
-            Hero(
-              tag: content.bvid,
-              child: NetworkImgLayer(
-                type: floor == 1 ? 'emote' : null,
-                width: width,
-                height: width / StyleString.aspectRatio,
-                src: content.cover,
-              ),
+            NetworkImgLayer(
+              type: floor == 1 ? 'emote' : null,
+              width: width,
+              height: width / StyleString.aspectRatio,
+              src: content.cover,
             ),
             if (content.badge != null && type == 'pgc')
               PBadge(
diff --git a/lib/pages/fav/controller.dart b/lib/pages/fav/controller.dart
index 6ff0afc8..8fcbf971 100644
--- a/lib/pages/fav/controller.dart
+++ b/lib/pages/fav/controller.dart
@@ -10,16 +10,22 @@ import 'package:pilipala/utils/storage.dart';
 class FavController extends GetxController {
   final ScrollController scrollController = ScrollController();
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
+  RxList<FavFolderItemData> favFolderList = <FavFolderItemData>[].obs;
   Box userInfoCache = GStrorage.userInfo;
   UserInfoData? userInfo;
   int currentPage = 1;
   int pageSize = 60;
   RxBool hasMore = true.obs;
 
-  Future<dynamic> queryFavFolder({type = 'init'}) async {
+  @override
+  void onInit() {
     userInfo = userInfoCache.get('userInfoCache');
+    super.onInit();
+  }
+
+  Future<dynamic> queryFavFolder({type = 'init'}) async {
     if (userInfo == null) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     if (!hasMore.value) {
       return;
@@ -32,9 +38,10 @@ class FavController extends GetxController {
     if (res['status']) {
       if (type == 'init') {
         favFolderData.value = res['data'];
+        favFolderList.value = res['data'].list;
       } else {
         if (res['data'].list.isNotEmpty) {
-          favFolderData.value.list!.addAll(res['data'].list);
+          favFolderList.addAll(res['data'].list);
           favFolderData.update((val) {});
         }
       }
@@ -49,4 +56,13 @@ class FavController extends GetxController {
   Future onLoad() async {
     queryFavFolder(type: 'onload');
   }
+
+  removeFavFolder({required int mediaIds}) async {
+    for (var i in favFolderList) {
+      if (i.id == mediaIds) {
+        favFolderList.remove(i);
+        break;
+      }
+    }
+  }
 }
diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart
index b980914a..4f48213e 100644
--- a/lib/pages/fav/view.dart
+++ b/lib/pages/fav/view.dart
@@ -1,9 +1,11 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/fav/index.dart';
 import 'package:pilipala/pages/fav/widgets/item.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 class FavPage extends StatefulWidget {
   const FavPage({super.key});
@@ -57,16 +59,15 @@ class _FavPageState extends State<FavPage> {
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.done) {
-            Map data = snapshot.data as Map;
-            if (data['status']) {
+            Map? data = snapshot.data;
+            if (data != null && data['status']) {
               return Obx(
                 () => ListView.builder(
                   controller: scrollController,
-                  itemCount: _favController.favFolderData.value.list!.length,
+                  itemCount: _favController.favFolderList.length,
                   itemBuilder: (context, index) {
                     return FavItem(
-                        favFolderItem:
-                            _favController.favFolderData.value.list![index]);
+                        favFolderItem: _favController.favFolderList[index]);
                   },
                 ),
               );
@@ -75,15 +76,30 @@ class _FavPageState extends State<FavPage> {
                 physics: const NeverScrollableScrollPhysics(),
                 slivers: [
                   HttpError(
-                    errMsg: data['msg'],
-                    fn: () => setState(() {}),
+                    errMsg: data?['msg'] ?? '请求异常',
+                    btnText: data?['code'] == -101 ? '去登录' : null,
+                    fn: () {
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _favController.queryFavFolder();
+                        });
+                      }
+                    },
                   ),
                 ],
               );
             }
           } else {
             // 骨架屏
-            return const Text('请求中');
+            return ListView.builder(
+              itemBuilder: (context, index) {
+                return const VideoCardHSkeleton();
+              },
+              itemCount: 10,
+            );
           }
         },
       ),
diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart
index 08730d7b..3c44ec9d 100644
--- a/lib/pages/fav/widgets/item.dart
+++ b/lib/pages/fav/widgets/item.dart
@@ -13,14 +13,16 @@ class FavItem extends StatelessWidget {
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(favFolderItem.fid);
     return InkWell(
-      onTap: () => Get.toNamed(
-        '/favDetail',
-        arguments: favFolderItem,
-        parameters: {
-          'heroTag': heroTag,
-          'mediaId': favFolderItem.id.toString(),
-        },
-      ),
+      onTap: () async {
+        Get.toNamed(
+          '/favDetail',
+          arguments: favFolderItem,
+          parameters: {
+            'heroTag': heroTag,
+            'mediaId': favFolderItem.id.toString(),
+          },
+        );
+      },
       child: Padding(
         padding: const EdgeInsets.fromLTRB(12, 7, 12, 7),
         child: LayoutBuilder(
diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart
index 55d5b884..7af398e8 100644
--- a/lib/pages/fav_detail/controller.dart
+++ b/lib/pages/fav_detail/controller.dart
@@ -1,9 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/user/fav_detail.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/pages/fav/index.dart';
 
 class FavDetailController extends GetxController {
   FavFolderItemData? item;
@@ -74,4 +76,41 @@ class FavDetailController extends GetxController {
   onLoad() {
     queryUserFavFolderDetail(type: 'onLoad');
   }
+
+  onDelFavFolder() async {
+    SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('提示'),
+          content: const Text('确定删除这个收藏夹吗？'),
+          actions: [
+            TextButton(
+              onPressed: () async {
+                SmartDialog.dismiss();
+              },
+              child: Text(
+                '点错了',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            TextButton(
+              onPressed: () async {
+                var res = await UserHttp.delFavFolder(mediaIds: mediaId!);
+                SmartDialog.dismiss();
+                SmartDialog.showToast(res['status'] ? '操作成功' : res['msg']);
+                if (res['status']) {
+                  FavController favController = Get.find<FavController>();
+                  await favController.removeFavFolder(mediaIds: mediaId!);
+                  Get.back();
+                }
+              },
+              child: const Text('确认'),
+            )
+          ],
+        );
+      },
+    );
+  }
 }
diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart
index 993ff63b..1bf5cb6f 100644
--- a/lib/pages/fav_detail/view.dart
+++ b/lib/pages/fav_detail/view.dart
@@ -101,11 +101,19 @@ class _FavDetailPageState extends State<FavDetailPage> {
                     Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'),
                 icon: const Icon(Icons.search_outlined),
               ),
-              //   IconButton(
-              //     onPressed: () {},
-              //     icon: const Icon(Icons.more_vert),
-              //   ),
-              const SizedBox(width: 6),
+              PopupMenuButton<String>(
+                icon: const Icon(Icons.more_vert_outlined),
+                position: PopupMenuPosition.under,
+                onSelected: (String type) {},
+                itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+                  PopupMenuItem<String>(
+                    onTap: () => _favDetailController.onDelFavFolder(),
+                    value: 'pause',
+                    child: const Text('删除收藏夹'),
+                  ),
+                ],
+              ),
+              const SizedBox(width: 14),
             ],
             flexibleSpace: FlexibleSpaceBar(
               background: Container(
diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart
index 1c4008ff..72d7b4a0 100644
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:pilipala/common/constants.dart';
@@ -7,6 +8,7 @@ import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/utils/id_utils.dart';
+import 'package:pilipala/utils/image_save.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import '../../../common/widgets/badge.dart';
@@ -61,6 +63,11 @@ class FavVideoCardH extends StatelessWidget {
               epId != null ? SearchType.media_bangumi : SearchType.video,
         });
       },
+      onLongPress: () => imageSaveDialog(
+        context,
+        videoItem,
+        SmartDialog.dismiss,
+      ),
       child: Column(
         children: [
           Padding(
@@ -210,7 +217,7 @@ class VideoContent extends StatelessWidget {
                     bottom: -4,
                     child: IconButton(
                       style: ButtonStyle(
-                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        padding: WidgetStateProperty.all(EdgeInsets.zero),
                       ),
                       onPressed: () {
                         showDialog(
diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart
index a1f18113..64953e3b 100644
--- a/lib/pages/history/controller.dart
+++ b/lib/pages/history/controller.dart
@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/history.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class HistoryController extends GetxController {
@@ -15,14 +16,20 @@ class HistoryController extends GetxController {
   RxBool isLoading = false.obs;
   RxBool enableMultiple = false.obs;
   RxInt checkedCount = 0.obs;
+  Box userInfoCache = GStrorage.userInfo;
+  UserInfoData? userInfo;
 
   @override
   void onInit() {
     super.onInit();
     historyStatus();
+    userInfo = userInfoCache.get('userInfoCache');
   }
 
   Future queryHistoryList({type = 'init'}) async {
+    if (userInfo == null) {
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
+    }
     int max = 0;
     int viewAt = 0;
     if (type == 'onload') {
diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart
index 92e1eee7..f9695aed 100644
--- a/lib/pages/history/view.dart
+++ b/lib/pages/history/view.dart
@@ -5,6 +5,7 @@ import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/pages/history/index.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 import 'widgets/item.dart';
 
@@ -183,8 +184,8 @@ class _HistoryPageState extends State<HistoryPage> {
                   if (snapshot.data == null) {
                     return const SliverToBoxAdapter(child: SizedBox());
                   }
-                  Map data = snapshot.data;
-                  if (data['status']) {
+                  Map? data = snapshot.data;
+                  if (data != null && data['status']) {
                     return Obx(
                       () => _historyController.historyList.isNotEmpty
                           ? SliverList(
@@ -209,8 +210,18 @@ class _HistoryPageState extends State<HistoryPage> {
                     );
                   } else {
                     return HttpError(
-                      errMsg: data['msg'],
-                      fn: () => setState(() {}),
+                      errMsg: data?['msg'] ?? '请求异常',
+                      btnText: data?['code'] == -101 ? '去登录' : null,
+                      fn: () {
+                        if (data?['code'] == -101) {
+                          RoutePush.loginRedirectPush();
+                        } else {
+                          setState(() {
+                            _futureBuilderFuture =
+                                _historyController.queryHistoryList();
+                          });
+                        }
+                      },
                     );
                   }
                 } else {
diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart
index 39c6931d..8e71df6f 100644
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -7,13 +7,13 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
-import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/business_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/pages/history_search/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class HistoryItem extends StatelessWidget {
@@ -101,26 +101,11 @@ class HistoryItem extends StatelessWidget {
             }
           } else {
             if (videoItem.history.epid != '') {
-              SmartDialog.showLoading(msg: '获取中...');
-              var res =
-                  await SearchHttp.bangumiInfo(epId: videoItem.history.epid);
-              SmartDialog.dismiss();
-              if (res['status']) {
-                EpisodeItem episode = res['data'].episodes.first;
-                String bvid = episode.bvid!;
-                int cid = episode.cid!;
-                String pic = episode.cover!;
-                String heroTag = Utils.makeHeroTag(cid);
-                Get.toNamed(
-                  '/video?bvid=$bvid&cid=$cid&seasonId=${res['data'].seasonId}',
-                  arguments: {
-                    'pic': pic,
-                    'heroTag': heroTag,
-                    'videoType': SearchType.media_bangumi,
-                    'bangumiItem': res['data'],
-                  },
-                );
-              }
+              RoutePush.bangumiPush(
+                null,
+                videoItem.history.epid,
+                heroTag: heroTag,
+              );
             }
           }
         } else {
@@ -213,7 +198,8 @@ class HistoryItem extends StatelessWidget {
                                 duration: const Duration(milliseconds: 200),
                                 child: Container(
                                   decoration: BoxDecoration(
-                                    borderRadius: BorderRadius.circular(12),
+                                    borderRadius: BorderRadius.circular(
+                                        StyleString.imgRadius.x),
                                     color: Colors.black.withOpacity(
                                         ctr!.enableMultiple.value &&
                                                 videoItem.checked
@@ -231,11 +217,10 @@ class HistoryItem extends StatelessWidget {
                                         curve: Curves.easeInOut,
                                         child: IconButton(
                                           style: ButtonStyle(
-                                            padding: MaterialStateProperty.all(
+                                            padding: WidgetStateProperty.all(
                                                 EdgeInsets.zero),
                                             backgroundColor:
-                                                MaterialStateProperty
-                                                    .resolveWith(
+                                                WidgetStateProperty.resolveWith(
                                               (states) {
                                                 return Colors.white
                                                     .withOpacity(0.8);
@@ -258,7 +243,7 @@ class HistoryItem extends StatelessWidget {
                               ),
                             ),
                           ),
-                          videoItem.progress != 0
+                          videoItem.progress != 0 && videoItem.duration != 0
                               ? Positioned(
                                   left: 3,
                                   right: 3,
diff --git a/lib/pages/history_search/controller.dart b/lib/pages/history_search/controller.dart
index 90ac7a02..a6c79e6a 100644
--- a/lib/pages/history_search/controller.dart
+++ b/lib/pages/history_search/controller.dart
@@ -10,9 +10,8 @@ class HistorySearchController extends GetxController {
   final FocusNode searchFocusNode = FocusNode();
   RxString searchKeyWord = ''.obs;
   String hintText = '搜索';
-  RxString loadingStatus = 'init'.obs;
+  RxBool loadingStatus = false.obs;
   RxString loadingText = '加载中...'.obs;
-  bool hasRequest = false;
   late int mid;
   RxString uname = ''.obs;
   int pn = 1;
@@ -36,8 +35,7 @@ class HistorySearchController extends GetxController {
 
   //  提交搜索内容
   void submit() {
-    loadingStatus.value = 'loading';
-    if (hasRequest) {
+    if (!loadingStatus.value) {
       pn = 1;
       searchHistories();
     }
@@ -48,6 +46,7 @@ class HistorySearchController extends GetxController {
     if (type == 'onLoad' && loadingText.value == '没有更多了') {
       return;
     }
+    loadingStatus.value = true;
     var res = await UserHttp.searchHistory(
       pn: pn,
       keyword: controller.value.text,
@@ -63,9 +62,8 @@ class HistorySearchController extends GetxController {
         loadingText.value = '没有更多了';
       }
       pn += 1;
-      hasRequest = true;
     }
-    loadingStatus.value = 'finish';
+    loadingStatus.value = false;
     return res;
   }
 
@@ -86,6 +84,6 @@ class HistorySearchController extends GetxController {
       historyList.removeWhere((e) => e.kid == kid);
       SmartDialog.showToast(res['msg']);
     }
-    loadingStatus.value = 'finish';
+    // loadingStatus.value = fasle;
   }
 }
diff --git a/lib/pages/history_search/view.dart b/lib/pages/history_search/view.dart
index 5bde691d..f5bcae64 100644
--- a/lib/pages/history_search/view.dart
+++ b/lib/pages/history_search/view.dart
@@ -2,7 +2,6 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/pages/history/widgets/item.dart';
 
@@ -16,20 +15,19 @@ class HistorySearchPage extends StatefulWidget {
 }
 
 class _HistorySearchPageState extends State<HistorySearchPage> {
-  final HistorySearchController _historySearchCtr =
-      Get.put(HistorySearchController());
+  final HistorySearchController _hisCtr = Get.put(HistorySearchController());
   late ScrollController scrollController;
 
   @override
   void initState() {
     super.initState();
-    scrollController = _historySearchCtr.scrollController;
+    scrollController = _hisCtr.scrollController;
     scrollController.addListener(
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
           EasyThrottle.throttle('history', const Duration(seconds: 1), () {
-            _historySearchCtr.onLoad();
+            _hisCtr.onLoad();
           });
         }
       },
@@ -50,19 +48,19 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
         titleSpacing: 0,
         actions: [
           IconButton(
-              onPressed: () => _historySearchCtr.submit(),
+              onPressed: () => _hisCtr.submit(),
               icon: const Icon(Icons.search_outlined, size: 22)),
           const SizedBox(width: 10)
         ],
         title: Obx(
           () => TextField(
             autofocus: true,
-            focusNode: _historySearchCtr.searchFocusNode,
-            controller: _historySearchCtr.controller.value,
+            focusNode: _hisCtr.searchFocusNode,
+            controller: _hisCtr.controller.value,
             textInputAction: TextInputAction.search,
-            onChanged: (value) => _historySearchCtr.onChange(value),
+            onChanged: (value) => _hisCtr.onChange(value),
             decoration: InputDecoration(
-              hintText: _historySearchCtr.hintText,
+              hintText: _hisCtr.hintText,
               border: InputBorder.none,
               suffixIcon: IconButton(
                 icon: Icon(
@@ -70,103 +68,61 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
                   size: 22,
                   color: Theme.of(context).colorScheme.outline,
                 ),
-                onPressed: () => _historySearchCtr.onClear(),
+                onPressed: () => _hisCtr.onClear(),
               ),
             ),
-            onSubmitted: (String value) => _historySearchCtr.submit(),
+            onSubmitted: (String value) => _hisCtr.submit(),
           ),
         ),
       ),
       body: Obx(
-        () => Column(
-          children: _historySearchCtr.loadingStatus.value == 'init'
-              ? [const SizedBox()]
-              : [
-                  Expanded(
-                    child: FutureBuilder(
-                      future: _historySearchCtr.searchHistories(),
-                      builder: (context, snapshot) {
-                        if (snapshot.connectionState == ConnectionState.done) {
-                          Map data = snapshot.data as Map;
-                          if (data['status']) {
-                            return Obx(
-                              () => _historySearchCtr.historyList.isNotEmpty
-                                  ? ListView.builder(
-                                      controller: scrollController,
-                                      itemCount:
-                                          _historySearchCtr.historyList.length +
-                                              1,
-                                      itemBuilder: (context, index) {
-                                        if (index ==
-                                            _historySearchCtr
-                                                .historyList.length) {
-                                          return Container(
-                                            height: MediaQuery.of(context)
-                                                    .padding
-                                                    .bottom +
-                                                60,
-                                            padding: EdgeInsets.only(
-                                                bottom: MediaQuery.of(context)
-                                                    .padding
-                                                    .bottom),
-                                            child: Center(
-                                              child: Obx(
-                                                () => Text(
-                                                  _historySearchCtr
-                                                      .loadingText.value,
-                                                  style: TextStyle(
-                                                      color: Theme.of(context)
-                                                          .colorScheme
-                                                          .outline,
-                                                      fontSize: 13),
-                                                ),
-                                              ),
-                                            ),
-                                          );
-                                        } else {
-                                          return HistoryItem(
-                                            videoItem: _historySearchCtr
-                                                .historyList[index],
-                                            ctr: _historySearchCtr,
-                                            onChoose: null,
-                                            onUpdateMultiple: () => null,
-                                          );
-                                        }
-                                      },
-                                    )
-                                  : _historySearchCtr.loadingStatus.value ==
-                                          'loading'
-                                      ? const SizedBox(child: Text('加载中...'))
-                                      : const CustomScrollView(
-                                          slivers: <Widget>[
-                                            NoData(),
-                                          ],
-                                        ),
-                            );
-                          } else {
-                            return CustomScrollView(
-                              slivers: <Widget>[
-                                HttpError(
-                                  errMsg: data['msg'],
-                                  fn: () => setState(() {}),
-                                )
-                              ],
-                            );
-                          }
+        () {
+          return _hisCtr.loadingStatus.value && _hisCtr.historyList.isEmpty
+              ? ListView.builder(
+                  itemCount: 10,
+                  itemBuilder: (context, index) {
+                    return const VideoCardHSkeleton();
+                  },
+                )
+              : _hisCtr.historyList.isNotEmpty
+                  ? ListView.builder(
+                      controller: scrollController,
+                      itemCount: _hisCtr.historyList.length + 1,
+                      itemBuilder: (context, index) {
+                        if (index == _hisCtr.historyList.length) {
+                          return Container(
+                            height: MediaQuery.of(context).padding.bottom + 60,
+                            padding: EdgeInsets.only(
+                                bottom: MediaQuery.of(context).padding.bottom),
+                            child: Center(
+                              child: Obx(
+                                () => Text(
+                                  _hisCtr.loadingText.value,
+                                  style: TextStyle(
+                                    color:
+                                        Theme.of(context).colorScheme.outline,
+                                    fontSize: 13,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          );
                         } else {
-                          // 骨架屏
-                          return ListView.builder(
-                            itemCount: 10,
-                            itemBuilder: (context, index) {
-                              return const VideoCardHSkeleton();
-                            },
+                          return HistoryItem(
+                            videoItem: _hisCtr.historyList[index],
+                            ctr: _hisCtr,
+                            onChoose: null,
+                            onUpdateMultiple: () => null,
                           );
                         }
                       },
-                    ),
-                  ),
-                ],
-        ),
+                    )
+                  : const CustomScrollView(
+                      slivers: <Widget>[
+                        NoData(),
+                      ],
+                    );
+        },
       ),
     );
   }
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
index cc228f6b..0c45a262 100644
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -214,6 +214,34 @@ class UserInfoWidget extends StatelessWidget {
   final VoidCallback? callback;
   final HomeController? ctr;
 
+  Widget buildLoggedInWidget(context) {
+    return Stack(
+      children: [
+        NetworkImgLayer(
+          type: 'avatar',
+          width: 34,
+          height: 34,
+          src: userFace,
+        ),
+        Positioned.fill(
+          child: Material(
+            color: Colors.transparent,
+            child: InkWell(
+              onTap: () => callback?.call(),
+              splashColor: Theme.of(context)
+                  .colorScheme
+                  .primaryContainer
+                  .withOpacity(0.3),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(50),
+              ),
+            ),
+          ),
+        )
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Row(
@@ -231,31 +259,7 @@ class UserInfoWidget extends StatelessWidget {
         const SizedBox(width: 8),
         Obx(
           () => userLogin.value
-              ? Stack(
-                  children: [
-                    NetworkImgLayer(
-                      type: 'avatar',
-                      width: 34,
-                      height: 34,
-                      src: userFace,
-                    ),
-                    Positioned.fill(
-                      child: Material(
-                        color: Colors.transparent,
-                        child: InkWell(
-                          onTap: () => callback?.call(),
-                          splashColor: Theme.of(context)
-                              .colorScheme
-                              .primaryContainer
-                              .withOpacity(0.3),
-                          borderRadius: const BorderRadius.all(
-                            Radius.circular(50),
-                          ),
-                        ),
-                      ),
-                    )
-                  ],
-                )
+              ? buildLoggedInWidget(context)
               : DefaultUser(callback: () => callback!()),
         ),
       ],
@@ -274,8 +278,8 @@ class DefaultUser extends StatelessWidget {
       height: 38,
       child: IconButton(
         style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
-          backgroundColor: MaterialStateProperty.resolveWith((states) {
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+          backgroundColor: WidgetStateProperty.resolveWith((states) {
             return Theme.of(context).colorScheme.onInverseSurface;
           }),
         ),
@@ -367,8 +371,8 @@ class CustomChip extends StatelessWidget {
       ),
       backgroundColor: secondaryContainer,
       selectedColor: secondaryContainer,
-      color: MaterialStateProperty.resolveWith<Color>(
-          (Set<MaterialState> states) => secondaryContainer.withAlpha(200)),
+      color: WidgetStateProperty.resolveWith<Color>(
+          (Set<WidgetState> states) => secondaryContainer.withAlpha(200)),
       padding: const EdgeInsets.fromLTRB(7, 1, 7, 1),
       label: Text(label, style: chipTextStyle),
       onPressed: () => onTap(),
@@ -402,30 +406,27 @@ class SearchBar extends StatelessWidget {
           color: colorScheme.onSecondaryContainer.withOpacity(0.05),
           child: InkWell(
             splashColor: colorScheme.primaryContainer.withOpacity(0.3),
-            onTap: () => Get.toNamed(
-              '/search',
-              parameters: {'hintText': ctr!.defaultSearch.value},
-            ),
-            child: Row(
-              children: [
-                const SizedBox(width: 14),
-                Icon(
-                  Icons.search_outlined,
-                  color: colorScheme.onSecondaryContainer,
-                ),
-                const SizedBox(width: 10),
-                Obx(
-                  () => Expanded(
-                    child: Text(
+            onTap: () => Get.toNamed('/search',
+                parameters: {'hintText': ctr!.defaultSearch.value}),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 14),
+              child: Row(
+                children: [
+                  Icon(
+                    Icons.search_outlined,
+                    color: colorScheme.onSecondaryContainer,
+                  ),
+                  const SizedBox(width: 10),
+                  Obx(
+                    () => Text(
                       ctr!.defaultSearch.value,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(color: colorScheme.outline),
                     ),
                   ),
-                ),
-                const SizedBox(width: 15),
-              ],
+                ],
+              ),
             ),
           ),
         ),
diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart
index e2e20e73..80d08e7b 100644
--- a/lib/pages/hot/view.dart
+++ b/lib/pages/hot/view.dart
@@ -3,8 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
@@ -78,15 +76,6 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                           return VideoCardH(
                             videoItem: _hotController.videoList[index],
                             showPubdate: true,
-                            longPress: () {
-                              _hotController.popupDialog = _createPopupDialog(
-                                  _hotController.videoList[index]);
-                              Overlay.of(context)
-                                  .insert(_hotController.popupDialog!);
-                            },
-                            longPressEnd: () {
-                              _hotController.popupDialog?.remove();
-                            },
                           );
                         }, childCount: _hotController.videoList.length),
                       ),
@@ -122,14 +111,4 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
       ),
     );
   }
-
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _hotController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem, closeFn: _hotController.popupDialog?.remove),
-      ),
-    );
-  }
 }
diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart
index 3de51901..f7dfea9f 100644
--- a/lib/pages/later/controller.dart
+++ b/lib/pages/later/controller.dart
@@ -1,16 +1,30 @@
 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/http/user.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
+import 'package:pilipala/models/user/info.dart';
+import 'package:pilipala/utils/storage.dart';
 
 class LaterController extends GetxController {
   final ScrollController scrollController = ScrollController();
   RxList<HotVideoItemModel> laterList = <HotVideoItemModel>[].obs;
   int count = 0;
   RxBool isLoading = false.obs;
+  Box userInfoCache = GStrorage.userInfo;
+  UserInfoData? userInfo;
+
+  @override
+  void onInit() {
+    super.onInit();
+    userInfo = userInfoCache.get('userInfoCache');
+  }
 
   Future queryLaterList() async {
+    if (userInfo == null) {
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
+    }
     isLoading.value = true;
     var res = await UserHttp.seeYouLater();
     if (res['status']) {
diff --git a/lib/pages/later/view.dart b/lib/pages/later/view.dart
index d4695154..0a02cb79 100644
--- a/lib/pages/later/view.dart
+++ b/lib/pages/later/view.dart
@@ -5,6 +5,7 @@ import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/no_data.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/pages/later/index.dart';
+import 'package:pilipala/utils/route_push.dart';
 
 class LaterPage extends StatefulWidget {
   const LaterPage({super.key});
@@ -72,8 +73,8 @@ class _LaterPageState extends State<LaterPage> {
             future: _futureBuilderFuture,
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.done) {
-                Map data = snapshot.data as Map;
-                if (data['status']) {
+                Map? data = snapshot.data;
+                if (data != null && data['status']) {
                   return Obx(
                     () => _laterController.laterList.isNotEmpty &&
                             !_laterController.isLoading.value
@@ -84,7 +85,7 @@ class _LaterPageState extends State<LaterPage> {
                               return VideoCardH(
                                   videoItem: videoItem,
                                   source: 'later',
-                                  longPress: () => _laterController.toViewDel(
+                                  onPressedFn: () => _laterController.toViewDel(
                                       aid: videoItem.aid));
                             }, childCount: _laterController.laterList.length),
                           )
@@ -96,10 +97,18 @@ class _LaterPageState extends State<LaterPage> {
                   );
                 } else {
                   return HttpError(
-                    errMsg: data['msg'],
-                    fn: () => setState(() {
-                      _futureBuilderFuture = _laterController.queryLaterList();
-                    }),
+                    errMsg: data?['msg'] ?? '请求异常',
+                    btnText: data?['code'] == -101 ? '去登录' : null,
+                    fn: () {
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _laterController.queryLaterList();
+                        });
+                      }
+                    },
                   );
                 }
               } else {
diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
index c61d20b3..83605495 100644
--- a/lib/pages/live/view.dart
+++ b/lib/pages/live/view.dart
@@ -5,9 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/video_card_v.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/utils/main_stream.dart';
 
 import 'controller.dart';
@@ -112,16 +110,6 @@ class _LivePageState extends State<LivePage>
     );
   }
 
-  OverlayEntry _createPopupDialog(liveItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _liveController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: liveItem, closeFn: _liveController.popupDialog?.remove),
-      ),
-    );
-  }
-
   Widget contentGrid(ctr, liveList) {
     // double maxWidth = Get.size.width;
     // int baseWidth = 500;
@@ -152,14 +140,6 @@ class _LivePageState extends State<LivePage>
               ? LiveCardV(
                   liveItem: liveList[index],
                   crossAxisCount: crossAxisCount,
-                  longPress: () {
-                    _liveController.popupDialog =
-                        _createPopupDialog(liveList[index]);
-                    Overlay.of(context).insert(_liveController.popupDialog!);
-                  },
-                  longPressEnd: () {
-                    _liveController.popupDialog?.remove();
-                  },
                 )
               : const VideoCardVSkeleton();
         },
diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart
index 9218d4fb..f70ba82b 100644
--- a/lib/pages/live/widgets/live_item.dart
+++ b/lib/pages/live/widgets/live_item.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/models/live/item.dart';
+import 'package:pilipala/utils/image_save.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 
@@ -9,81 +11,66 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';
 class LiveCardV extends StatelessWidget {
   final LiveItemModel liveItem;
   final int crossAxisCount;
-  final Function()? longPress;
-  final Function()? longPressEnd;
 
   const LiveCardV({
     Key? key,
     required this.liveItem,
     required this.crossAxisCount,
-    this.longPress,
-    this.longPressEnd,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     String heroTag = Utils.makeHeroTag(liveItem.roomId);
-    return Card(
-      elevation: 0,
-      clipBehavior: Clip.hardEdge,
-      margin: EdgeInsets.zero,
-      child: GestureDetector(
-        onLongPress: () {
-          if (longPress != null) {
-            longPress!();
-          }
-        },
-        // onLongPressEnd: (details) {
-        //   if (longPressEnd != null) {
-        //     longPressEnd!();
-        //   }
-        // },
-        child: InkWell(
-          onTap: () async {
-            Get.toNamed('/liveRoom?roomid=${liveItem.roomId}',
-                arguments: {'liveItem': liveItem, 'heroTag': heroTag});
-          },
-          child: Column(
-            children: [
-              ClipRRect(
-                borderRadius: const BorderRadius.all(StyleString.imgRadius),
-                child: AspectRatio(
-                  aspectRatio: StyleString.aspectRatio,
-                  child: LayoutBuilder(builder: (context, boxConstraints) {
-                    double maxWidth = boxConstraints.maxWidth;
-                    double maxHeight = boxConstraints.maxHeight;
-                    return Stack(
-                      children: [
-                        Hero(
-                          tag: heroTag,
-                          child: NetworkImgLayer(
-                            src: liveItem.cover!,
-                            width: maxWidth,
-                            height: maxHeight,
+    return InkWell(
+      onLongPress: () => imageSaveDialog(
+        context,
+        liveItem,
+        SmartDialog.dismiss,
+      ),
+      borderRadius: BorderRadius.circular(16),
+      onTap: () async {
+        Get.toNamed('/liveRoom?roomid=${liveItem.roomId}',
+            arguments: {'liveItem': liveItem, 'heroTag': heroTag});
+      },
+      child: Column(
+        children: [
+          ClipRRect(
+            borderRadius: const BorderRadius.all(StyleString.imgRadius),
+            child: AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(builder: (context, boxConstraints) {
+                double maxWidth = boxConstraints.maxWidth;
+                double maxHeight = boxConstraints.maxHeight;
+                return Stack(
+                  children: [
+                    Hero(
+                      tag: heroTag,
+                      child: NetworkImgLayer(
+                        src: liveItem.cover!,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                    ),
+                    if (crossAxisCount != 1)
+                      Positioned(
+                        left: 0,
+                        right: 0,
+                        bottom: 0,
+                        child: AnimatedOpacity(
+                          opacity: 1,
+                          duration: const Duration(milliseconds: 200),
+                          child: VideoStat(
+                            liveItem: liveItem,
                           ),
                         ),
-                        if (crossAxisCount != 1)
-                          Positioned(
-                            left: 0,
-                            right: 0,
-                            bottom: 0,
-                            child: AnimatedOpacity(
-                              opacity: 1,
-                              duration: const Duration(milliseconds: 200),
-                              child: VideoStat(
-                                liveItem: liveItem,
-                              ),
-                            ),
-                          ),
-                      ],
-                    );
-                  }),
-                ),
-              ),
-              LiveContent(liveItem: liveItem, crossAxisCount: crossAxisCount)
-            ],
+                      ),
+                  ],
+                );
+              }),
+            ),
           ),
-        ),
+          LiveContent(liveItem: liveItem, crossAxisCount: crossAxisCount)
+        ],
       ),
     );
   }
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index 5c2a9800..4e67fa2c 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -17,8 +17,7 @@ class LiveRoomController extends GetxController {
   double volume = 0.0;
   // 静音状态
   RxBool volumeOff = false.obs;
-  PlPlayerController plPlayerController =
-      PlPlayerController.getInstance(videoType: 'live');
+  PlPlayerController plPlayerController = PlPlayerController(videoType: 'live');
   Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
   late bool enableCDN;
   late int currentQn;
diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart
index e5a9d6c9..6abb1260 100644
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@@ -124,7 +124,7 @@ class _BottomControlState extends State<BottomControl> {
               height: 34,
               child: IconButton(
                 style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
                 ),
                 onPressed: () async {
                   bool canUsePiP = false;
@@ -153,7 +153,8 @@ class _BottomControlState extends State<BottomControl> {
               size: 20,
               color: Colors.white,
             ),
-            fuc: () => widget.controller!.triggerFullScreen(),
+            fuc: () => widget.controller!.triggerFullScreen(
+                status: !(widget.controller!.isFullScreen.value)),
           ),
         ],
       ),
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index c002fdf9..fbb06e2f 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -1,11 +1,14 @@
+import 'dart:async';
 import 'dart:io';
 
+import 'package:encrypt/encrypt.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/login.dart';
 import 'package:gt3_flutter_plugin/gt3_flutter_plugin.dart';
 import 'package:pilipala/models/login/index.dart';
+import 'package:pilipala/utils/login.dart';
 
 class LoginPageController extends GetxController {
   final GlobalKey mobFormKey = GlobalKey<FormState>();
@@ -26,9 +29,23 @@ class LoginPageController extends GetxController {
 
   final Gt3FlutterPlugin captcha = Gt3FlutterPlugin();
 
+  // 倒计时60s
+  RxInt seconds = 60.obs;
+  Timer? timer;
+  RxBool smsCodeSendStatus = false.obs;
+
   // 默认密码登录
   RxInt loginType = 0.obs;
 
+  late String captchaKey;
+
+  late int tel;
+  late int webSmsCode;
+
+  RxInt validSeconds = 180.obs;
+  Timer? validTimer;
+  late String qrcodeKey;
+
   // 监听pageView切换
   void onPageChange(int index) {
     currentIndex.value = index;
@@ -43,6 +60,7 @@ class LoginPageController extends GetxController {
         curve: Curves.easeInOut,
       );
       passwordTextFieldNode.requestFocus();
+      (mobFormKey.currentState as FormState).save();
     }
   }
 
@@ -86,18 +104,64 @@ class LoginPageController extends GetxController {
     }
   }
 
-  // 验证码登录
-  void loginInByCode() {
-    if ((msgCodeFormKey.currentState as FormState).validate()) {}
+  // web端密码登录
+  void loginInByWebPassword() async {
+    if ((passwordFormKey.currentState as FormState).validate()) {
+      getCaptcha((data) async {
+        CaptchaDataModel captchaData = data;
+        var webKeyRes = await LoginHttp.getWebKey();
+        if (webKeyRes['status']) {
+          String rhash = webKeyRes['data']['hash'];
+          String key = webKeyRes['data']['key'];
+          dynamic publicKey = RSAKeyParser().parse(key);
+          String passwordEncryptyed = Encrypter(RSA(publicKey: publicKey))
+              .encrypt(rhash + passwordTextController.text)
+              .base64;
+          var res = await LoginHttp.loginInByWebPwd(
+            username: tel,
+            password: passwordEncryptyed,
+            token: captchaData.token!,
+            challenge: captchaData.geetest!.challenge!,
+            validate: captchaData.validate!,
+            seccode: captchaData.seccode!,
+          );
+          if (res['status']) {
+            await LoginUtils.confirmLogin('', null);
+          } else {
+            SmartDialog.showToast(res['msg']);
+          }
+        } else {
+          SmartDialog.showToast(webKeyRes['msg']);
+        }
+      });
+    }
   }
 
-  // app端验证码
-  void getMsgCode() async {
+  // web端验证码登录
+  void loginInByCode() async {
+    if ((msgCodeFormKey.currentState as FormState).validate()) {
+      (msgCodeFormKey.currentState as FormState).save();
+      var res = await LoginHttp.loginInByWebSmsCode(
+        cid: 86,
+        tel: tel,
+        code: webSmsCode,
+        captchaKey: captchaKey,
+      );
+      if (res['status']) {
+        await LoginUtils.confirmLogin('', null);
+      } else {
+        SmartDialog.showToast(res['msg']);
+      }
+    }
+  }
+
+  // 获取app端验证码
+  void getAppMsgCode() async {
     getCaptcha((data) async {
       CaptchaDataModel captchaData = data;
       var res = await LoginHttp.sendAppSmsCode(
         cid: 86,
-        tel: 13734077064,
+        tel: tel,
         token: captchaData.token!,
         challenge: captchaData.geetest!.challenge!,
         validate: captchaData.validate!,
@@ -121,7 +185,7 @@ class LoginPageController extends GetxController {
       captcha.addEventHandler(onShow: (Map<String, dynamic> message) async {
         SmartDialog.dismiss();
       }, onClose: (Map<String, dynamic> message) async {
-        SmartDialog.showToast('关闭验证');
+        SmartDialog.showToast('取消验证');
       }, onResult: (Map<String, dynamic> message) async {
         debugPrint("Captcha result: $message");
         String code = message["code"];
@@ -201,4 +265,72 @@ class LoginPageController extends GetxController {
       captcha.startCaptcha(registerData);
     } else {}
   }
+
+  // 获取web端验证码
+  void getWebMsgCode() async {
+    getCaptcha((data) async {
+      CaptchaDataModel captchaData = data;
+      var res = await LoginHttp.sendWebSmsCode(
+        cid: 86,
+        tel: tel,
+        token: captchaData.token!,
+        challenge: captchaData.geetest!.challenge!,
+        validate: captchaData.validate!,
+        seccode: captchaData.seccode!,
+      );
+      if (res['status']) {
+        captchaKey = res['data']['captcha_key'];
+        SmartDialog.showToast('验证码已发送');
+        // 倒计时60s
+        smsCodeSendStatus.value = true;
+        startTimer();
+      } else {
+        SmartDialog.showToast(res['msg']);
+      }
+    });
+  }
+
+  // 验证码倒计时
+  void startTimer() {
+    timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (seconds.value > 0) {
+        seconds.value--;
+      } else {
+        seconds.value = 60;
+        smsCodeSendStatus.value = false;
+        timer.cancel();
+      }
+    });
+  }
+
+  // 获取登录二维码
+  Future getWebQrcode() async {
+    var res = await LoginHttp.getWebQrcode();
+    validSeconds.value = 180;
+    if (res['status']) {
+      qrcodeKey = res['data']['qrcode_key'];
+      validTimer = Timer.periodic(const Duration(seconds: 1), (validTimer) {
+        if (validSeconds.value > 0) {
+          validSeconds.value--;
+          queryWebQrcodeStatus();
+        } else {
+          getWebQrcode();
+          validTimer.cancel();
+        }
+      });
+      return res;
+    } else {
+      SmartDialog.showToast(res['msg']);
+    }
+  }
+
+  // 轮询二维码登录状态
+  Future queryWebQrcodeStatus() async {
+    var res = await LoginHttp.queryWebQrcodeStatus(qrcodeKey);
+    if (res['status']) {
+      await LoginUtils.confirmLogin('', null);
+      validTimer?.cancel();
+      Get.back();
+    }
+  }
 }
diff --git a/lib/pages/login/view.dart b/lib/pages/login/view.dart
index 6521e9d9..04d5a1a8 100644
--- a/lib/pages/login/view.dart
+++ b/lib/pages/login/view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:qr_flutter/qr_flutter.dart';
 
 import 'controller.dart';
 
@@ -14,8 +15,10 @@ class _LoginPageState extends State<LoginPage> {
   final LoginPageController _loginPageCtr = Get.put(LoginPageController());
 
   @override
-  void initState() {
-    super.initState();
+  void dispose() {
+    _loginPageCtr.validTimer?.cancel();
+    _loginPageCtr.timer?.cancel();
+    super.dispose();
   }
 
   @override
@@ -37,6 +40,107 @@ class _LoginPageState extends State<LoginPage> {
                   icon: const Icon(Icons.arrow_back),
                 ),
         ),
+        actions: [
+          IconButton(
+            tooltip: '浏览器打开',
+            onPressed: () {
+              Get.offNamed(
+                '/webview',
+                parameters: {
+                  'url': 'https://passport.bilibili.com/h5-app/passport/login',
+                  'type': 'login',
+                  'pageTitle': '登录bilibili',
+                },
+              );
+            },
+            icon: const Icon(Icons.language, size: 20),
+          ),
+          IconButton(
+            tooltip: '二维码登录',
+            onPressed: () {
+              showDialog(
+                context: context,
+                builder: (context) {
+                  return StatefulBuilder(
+                      builder: (context, StateSetter setState) {
+                    return AlertDialog(
+                      title: Row(
+                        children: [
+                          const Text('扫码登录'),
+                          IconButton(
+                            onPressed: () {
+                              setState(() {});
+                            },
+                            icon: const Icon(Icons.refresh),
+                          ),
+                        ],
+                      ),
+                      contentPadding: const EdgeInsets.fromLTRB(0, 0, 0, 4),
+                      content: AspectRatio(
+                        aspectRatio: 1,
+                        child: Container(
+                          width: 200,
+                          padding: const EdgeInsets.all(12),
+                          child: FutureBuilder(
+                            future: _loginPageCtr.getWebQrcode(),
+                            builder: (context, snapshot) {
+                              if (snapshot.connectionState ==
+                                  ConnectionState.done) {
+                                if (snapshot.data == null) {
+                                  return const SizedBox();
+                                }
+                                Map data = snapshot.data as Map;
+                                return QrImageView(
+                                  data: data['data']['url'],
+                                  backgroundColor: Colors.white,
+                                );
+                              } else {
+                                return const Center(
+                                  child: SizedBox(
+                                    width: 40,
+                                    height: 40,
+                                    child: CircularProgressIndicator(),
+                                  ),
+                                );
+                              }
+                            },
+                          ),
+                        ),
+                      ),
+                      actions: [
+                        TextButton(
+                          onPressed: () {},
+                          child: Obx(() {
+                            return Text(
+                              '有效期: ${_loginPageCtr.validSeconds.value}s',
+                              style: Theme.of(context).textTheme.titleMedium,
+                            );
+                          }),
+                        ),
+                        TextButton(
+                          onPressed: () {},
+                          child: Text(
+                            '检查登录状态',
+                            style: TextStyle(
+                              fontSize: Theme.of(context)
+                                  .textTheme
+                                  .titleMedium!
+                                  .fontSize,
+                            ),
+                          ),
+                        )
+                      ],
+                    );
+                  });
+                },
+              ).then((value) {
+                _loginPageCtr.validTimer!.cancel();
+              });
+            },
+            icon: const Icon(Icons.qr_code, size: 20),
+          ),
+          const SizedBox(width: 22),
+        ],
       ),
       body: PageView(
         physics: const NeverScrollableScrollPhysics(),
@@ -64,17 +168,9 @@ class _LoginPageState extends State<LoginPage> {
                         fontSize: 34,
                         fontWeight: FontWeight.w500),
                   ),
-                  Row(
-                    children: [
-                      Text(
-                        '请使用您的 BiliBili 账号登录。',
-                        style: Theme.of(context).textTheme.titleSmall!,
-                      ),
-                      GestureDetector(
-                        onTap: () {},
-                        child: const Icon(Icons.info_outline, size: 16),
-                      )
-                    ],
+                  Text(
+                    '请使用您的 BiliBili 账号登录。',
+                    style: Theme.of(context).textTheme.titleSmall!,
                   ),
                   Container(
                     margin: const EdgeInsets.only(top: 38, bottom: 15),
@@ -93,35 +189,12 @@ class _LoginPageState extends State<LoginPage> {
                       validator: (v) {
                         return v!.trim().isNotEmpty ? null : "手机号码不能为空";
                       },
-                      onSaved: (val) {
-                        print(val);
-                      },
+                      onSaved: (val) => _loginPageCtr.tel = int.parse(val!),
                       onEditingComplete: () {
                         _loginPageCtr.nextStep();
                       },
                     ),
                   ),
-                  GestureDetector(
-                    onTap: () {
-                      Get.offNamed(
-                        '/webview',
-                        parameters: {
-                          'url':
-                              'https://passport.bilibili.com/h5-app/passport/login',
-                          'type': 'login',
-                          'pageTitle': '登录bilibili',
-                        },
-                      );
-                    },
-                    child: Padding(
-                      padding: const EdgeInsets.only(left: 2),
-                      child: Text(
-                        '使用网页端登录',
-                        style: TextStyle(
-                            color: Theme.of(context).colorScheme.primary),
-                      ),
-                    ),
-                  ),
                   const Spacer(),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -176,8 +249,7 @@ class _LoginPageState extends State<LoginPage> {
                               IconButton(
                                 style: ButtonStyle(
                                   backgroundColor:
-                                      MaterialStateProperty.resolveWith(
-                                          (states) {
+                                      WidgetStateProperty.resolveWith((states) {
                                     return Theme.of(context)
                                         .colorScheme
                                         .primary
@@ -236,7 +308,7 @@ class _LoginPageState extends State<LoginPage> {
                                       .primary, // 设置按钮背景色
                                 ),
                                 onPressed: () =>
-                                    _loginPageCtr.loginInByAppPassword(),
+                                    _loginPageCtr.loginInByWebPassword(),
                                 child: const Text('确认登录'),
                               )
                             ],
@@ -267,8 +339,7 @@ class _LoginPageState extends State<LoginPage> {
                               IconButton(
                                 style: ButtonStyle(
                                   backgroundColor:
-                                      MaterialStateProperty.resolveWith(
-                                          (states) {
+                                      WidgetStateProperty.resolveWith((states) {
                                     return Theme.of(context)
                                         .colorScheme
                                         .primary
@@ -308,21 +379,28 @@ class _LoginPageState extends State<LoginPage> {
                                         ? null
                                         : "验证码不能为空";
                                   },
-                                  onSaved: (val) {
-                                    print(val);
-                                  },
+                                  onSaved: (val) => _loginPageCtr.webSmsCode =
+                                      int.parse(val!),
                                 ),
-                                Positioned(
-                                  right: 8,
-                                  top: 4,
-                                  child: Center(
-                                    child: TextButton(
-                                      onPressed: () =>
-                                          _loginPageCtr.getMsgCode(),
-                                      child: const Text('获取验证码'),
+                                Obx(() {
+                                  return Positioned(
+                                    right: 8,
+                                    top: 0,
+                                    child: Center(
+                                      child: TextButton(
+                                          onPressed: _loginPageCtr
+                                                  .smsCodeSendStatus.value
+                                              ? null
+                                              : () =>
+                                                  _loginPageCtr.getWebMsgCode(),
+                                          child: _loginPageCtr
+                                                  .smsCodeSendStatus.value
+                                              ? Text(
+                                                  '重新获取(${_loginPageCtr.seconds.value}s)')
+                                              : const Text('获取验证码')),
                                     ),
-                                  ),
-                                ),
+                                  );
+                                })
                               ],
                             ),
                           ),
diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart
index a77d9304..2ef2bf7f 100644
--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@@ -40,10 +40,10 @@ class MainController extends GetxController {
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
         SettingBoxKey.dynamicBadgeMode,
         defaultValue: DynamicBadgeMode.number.code)];
+    setNavBarConfig();
     if (dynamicBadgeType.value != DynamicBadgeMode.hidden) {
       getUnreadDynamic();
     }
-    setNavBarConfig();
   }
 
   void onBackPressed(BuildContext context) {
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index 617fcf83..29573501 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -138,14 +138,14 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                     duration: const Duration(milliseconds: 500),
                     offset: Offset(0, snapshot.data ? 0 : 1),
                     child: GlobalData().enableMYBar
-                        ? NavigationBar(
-                            onDestinationSelected: (value) => setIndex(value),
-                            selectedIndex: _mainController.selectedIndex,
-                            destinations: <Widget>[
-                              ..._mainController.navigationBars.map((e) {
-                                return NavigationDestination(
-                                  icon: Obx(
-                                    () => Badge(
+                        ? Obx(
+                            () => NavigationBar(
+                              onDestinationSelected: (value) => setIndex(value),
+                              selectedIndex: _mainController.selectedIndex,
+                              destinations: <Widget>[
+                                ..._mainController.navigationBars.map((e) {
+                                  return NavigationDestination(
+                                    icon: Badge(
                                       label: _mainController
                                                   .dynamicBadgeType.value ==
                                               DynamicBadgeMode.number
@@ -159,25 +159,25 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                                           e['count'] > 0,
                                       child: e['icon'],
                                     ),
-                                  ),
-                                  selectedIcon: e['selectIcon'],
-                                  label: e['label'],
-                                );
-                              }).toList(),
-                            ],
+                                    selectedIcon: e['selectIcon'],
+                                    label: e['label'],
+                                  );
+                                }).toList(),
+                              ],
+                            ),
                           )
-                        : BottomNavigationBar(
-                            currentIndex: _mainController.selectedIndex,
-                            type: BottomNavigationBarType.fixed,
-                            onTap: (value) => setIndex(value),
-                            iconSize: 16,
-                            selectedFontSize: 12,
-                            unselectedFontSize: 12,
-                            items: [
-                              ..._mainController.navigationBars.map((e) {
-                                return BottomNavigationBarItem(
-                                  icon: Obx(
-                                    () => Badge(
+                        : Obx(
+                            () => BottomNavigationBar(
+                              currentIndex: _mainController.selectedIndex,
+                              type: BottomNavigationBarType.fixed,
+                              onTap: (value) => setIndex(value),
+                              iconSize: 16,
+                              selectedFontSize: 12,
+                              unselectedFontSize: 12,
+                              items: [
+                                ..._mainController.navigationBars.map((e) {
+                                  return BottomNavigationBarItem(
+                                    icon: Badge(
                                       label: _mainController
                                                   .dynamicBadgeType.value ==
                                               DynamicBadgeMode.number
@@ -191,12 +191,12 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                                           e['count'] > 0,
                                       child: e['icon'],
                                     ),
-                                  ),
-                                  activeIcon: e['selectIcon'],
-                                  label: e['label'],
-                                );
-                              }).toList(),
-                            ],
+                                    activeIcon: e['selectIcon'],
+                                    label: e['label'],
+                                  );
+                                }).toList(),
+                              ],
+                            ),
                           ),
                   );
                 },
diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart
index 6541680a..f6a033e5 100644
--- a/lib/pages/media/view.dart
+++ b/lib/pages/media/view.dart
@@ -105,7 +105,7 @@ class _MediaPageState extends State<MediaPage>
           color: Theme.of(context).dividerColor.withOpacity(0.1),
         ),
         ListTile(
-          onTap: () {},
+          onTap: () => Get.toNamed('/fav'),
           leading: null,
           dense: true,
           title: Padding(
@@ -178,10 +178,10 @@ class _MediaPageState extends State<MediaPage>
                                   child: Center(
                                     child: IconButton(
                                       style: ButtonStyle(
-                                        padding: MaterialStateProperty.all(
+                                        padding: WidgetStateProperty.all(
                                             EdgeInsets.zero),
                                         backgroundColor:
-                                            MaterialStateProperty.resolveWith(
+                                            WidgetStateProperty.resolveWith(
                                                 (states) {
                                           return Theme.of(context)
                                               .colorScheme
diff --git a/lib/pages/member/view.dart b/lib/pages/member/view.dart
index b6648647..bb0d92be 100644
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@@ -90,9 +90,8 @@ class _MemberPageState extends State<MemberPage>
                             () => Text(
                               _memberController.memberInfo.value.name ?? '',
                               style: TextStyle(
-                                  color: Theme.of(context)
-                                      .colorScheme
-                                      .onBackground,
+                                  color:
+                                      Theme.of(context).colorScheme.onSurface,
                                   fontSize: 14),
                             ),
                           ),
diff --git a/lib/pages/member_archive/view.dart b/lib/pages/member_archive/view.dart
index 3103683a..f38ca0cb 100644
--- a/lib/pages/member_archive/view.dart
+++ b/lib/pages/member_archive/view.dart
@@ -79,6 +79,7 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                                     videoItem: list[index],
                                     showOwner: false,
                                     showPubdate: true,
+                                    showCharge: true,
                                   );
                                 },
                                 childCount: list.length,
diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart
index 68aa72d7..2e093bcc 100644
--- a/lib/pages/member_dynamics/view.dart
+++ b/lib/pages/member_dynamics/view.dart
@@ -5,6 +5,7 @@ import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
 import '../../common/widgets/http_error.dart';
+import '../../models/dynamics/result.dart';
 import '../dynamics/widgets/dynamic_panel.dart';
 
 class MemberDynamicsPage extends StatefulWidget {
@@ -66,7 +67,8 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
               if (snapshot.connectionState == ConnectionState.done) {
                 if (snapshot.data != null) {
                   Map data = snapshot.data as Map;
-                  List list = _memberDynamicController.dynamicsList;
+                  RxList<DynamicItemModel> list =
+                      _memberDynamicController.dynamicsList;
                   if (data['status']) {
                     return Obx(
                       () => list.isNotEmpty
diff --git a/lib/pages/member_seasons/widgets/item.dart b/lib/pages/member_seasons/widgets/item.dart
index 4df74b70..85b763b7 100644
--- a/lib/pages/member_seasons/widgets/item.dart
+++ b/lib/pages/member_seasons/widgets/item.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
 import 'package:pilipala/http/search.dart';
+import 'package:pilipala/utils/image_save.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class MemberSeasonsItem extends StatelessWidget {
@@ -29,6 +31,11 @@ class MemberSeasonsItem extends StatelessWidget {
           Get.toNamed('/video?bvid=${seasonItem.bvid}&cid=$cid',
               arguments: {'videoItem': seasonItem, 'heroTag': heroTag});
         },
+        onLongPress: () => imageSaveDialog(
+          context,
+          seasonItem,
+          SmartDialog.dismiss,
+        ),
         child: Column(
           children: [
             AspectRatio(
diff --git a/lib/pages/mine/controller.dart b/lib/pages/mine/controller.dart
index 5ad9e852..75c50d82 100644
--- a/lib/pages/mine/controller.dart
+++ b/lib/pages/mine/controller.dart
@@ -33,15 +33,7 @@ class MineController extends GetxController {
 
   onLogin() async {
     if (!userLogin.value) {
-      Get.toNamed(
-        '/webview',
-        parameters: {
-          'url': 'https://passport.bilibili.com/h5-app/passport/login',
-          'type': 'login',
-          'pageTitle': '登录bilibili',
-        },
-      );
-      // Get.toNamed('/loginPage');
+      Get.toNamed('/loginPage', preventDuplicates: false);
     } else {
       int mid = userInfo.value.mid!;
       String face = userInfo.value.face!;
diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart
index 04631a8c..72d81f95 100644
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@@ -3,8 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
@@ -82,15 +80,6 @@ class _ZonePageState extends State<ZonePage>
                           return VideoCardH(
                             videoItem: _zoneController.videoList[index],
                             showPubdate: true,
-                            longPress: () {
-                              _zoneController.popupDialog = _createPopupDialog(
-                                  _zoneController.videoList[index]);
-                              Overlay.of(context)
-                                  .insert(_zoneController.popupDialog!);
-                            },
-                            longPressEnd: () {
-                              _zoneController.popupDialog?.remove();
-                            },
                           );
                         }, childCount: _zoneController.videoList.length),
                       ),
@@ -126,14 +115,4 @@ class _ZonePageState extends State<ZonePage>
       ),
     );
   }
-
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _zoneController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem, closeFn: _zoneController.popupDialog?.remove),
-      ),
-    );
-  }
 }
diff --git a/lib/pages/rcmd/controller.dart b/lib/pages/rcmd/controller.dart
index 28ff055b..2d606b12 100644
--- a/lib/pages/rcmd/controller.dart
+++ b/lib/pages/rcmd/controller.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/video.dart';
@@ -106,4 +107,10 @@ class RcmdController extends GetxController {
           duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
     }
   }
+
+  void blockUserCb(mid) {
+    videoList.removeWhere((e) => e.owner.mid == mid);
+    videoList.refresh();
+    SmartDialog.showToast('已移除相关视频');
+  }
 }
diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart
index acc1e654..29a8d469 100644
--- a/lib/pages/rcmd/view.dart
+++ b/lib/pages/rcmd/view.dart
@@ -5,9 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/skeleton/video_card_v.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_v.dart';
 import 'package:pilipala/utils/main_stream.dart';
 
@@ -118,16 +116,6 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _rcmdController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem, closeFn: _rcmdController.popupDialog?.remove),
-      ),
-    );
-  }
-
   Widget contentGrid(ctr, videoList) {
     // double maxWidth = Get.size.width;
     // int baseWidth = 500;
@@ -158,14 +146,7 @@ class _RcmdPageState extends State<RcmdPage>
               ? VideoCardV(
                   videoItem: videoList[index],
                   crossAxisCount: crossAxisCount,
-                  longPress: () {
-                    _rcmdController.popupDialog =
-                        _createPopupDialog(videoList[index]);
-                    Overlay.of(context).insert(_rcmdController.popupDialog!);
-                  },
-                  longPressEnd: () {
-                    _rcmdController.popupDialog?.remove();
-                  },
+                  blockUserCb: (mid) => ctr.blockUserCb(mid),
                 )
               : const VideoCardVSkeleton();
         },
diff --git a/lib/pages/search/widgets/search_text.dart b/lib/pages/search/widgets/search_text.dart
index 039a851b..d3ffafea 100644
--- a/lib/pages/search/widgets/search_text.dart
+++ b/lib/pages/search/widgets/search_text.dart
@@ -5,18 +5,25 @@ class SearchText extends StatelessWidget {
   final Function? onSelect;
   final int? searchTextIdx;
   final Function? onLongSelect;
+  final bool isSelect;
   const SearchText({
     super.key,
     this.searchText,
     this.onSelect,
     this.searchTextIdx,
     this.onLongSelect,
+    this.isSelect = false,
   });
 
   @override
   Widget build(BuildContext context) {
     return Material(
-      color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5),
+      color: isSelect
+          ? Theme.of(context).colorScheme.primaryContainer
+          : Theme.of(context)
+              .colorScheme
+              .surfaceContainerHighest
+              .withOpacity(0.5),
       borderRadius: BorderRadius.circular(6),
       child: Padding(
         padding: EdgeInsets.zero,
@@ -34,7 +41,10 @@ class SearchText extends StatelessWidget {
             child: Text(
               searchText!,
               style: TextStyle(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant),
+                color: isSelect
+                    ? Theme.of(context).colorScheme.primary
+                    : Theme.of(context).colorScheme.onSurfaceVariant,
+              ),
             ),
           ),
         ),
diff --git a/lib/pages/search_panel/controller.dart b/lib/pages/search_panel/controller.dart
index 85952e90..35113198 100644
--- a/lib/pages/search_panel/controller.dart
+++ b/lib/pages/search_panel/controller.dart
@@ -16,14 +16,18 @@ class SearchPanelController extends GetxController {
   RxString order = ''.obs;
   // 视频时长筛选 仅用于搜索视频
   RxInt duration = 0.obs;
+  // 视频分区筛选 仅用于搜索视频 -1时不传
+  RxInt tids = (-1).obs;
 
   Future onSearch({type = 'init'}) async {
     var result = await SearchHttp.searchByType(
-        searchType: searchType!,
-        keyword: keyword!,
-        page: page.value,
-        order: searchType!.type != 'video' ? null : order.value,
-        duration: searchType!.type != 'video' ? null : duration.value);
+      searchType: searchType!,
+      keyword: keyword!,
+      page: page.value,
+      order: searchType!.type != 'video' ? null : order.value,
+      duration: searchType!.type != 'video' ? null : duration.value,
+      tids: searchType!.type != 'video' ? null : tids.value,
+    );
     if (result['status']) {
       if (type == 'onRefresh') {
         resultList.value = result['data'].list;
diff --git a/lib/pages/search_panel/widgets/live_panel.dart b/lib/pages/search_panel/widgets/live_panel.dart
index 6fb5f5b8..5f797f09 100644
--- a/lib/pages/search_panel/widgets/live_panel.dart
+++ b/lib/pages/search_panel/widgets/live_panel.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/utils/image_save.dart';
 import 'package:pilipala/utils/utils.dart';
 
 Widget searchLivePanel(BuildContext context, ctr, list) {
@@ -42,15 +44,15 @@ class LiveItem extends StatelessWidget {
           Get.toNamed('/liveRoom?roomid=${liveItem.roomid}',
               arguments: {'liveItem': liveItem, 'heroTag': heroTag});
         },
+        onLongPress: () => imageSaveDialog(
+          context,
+          liveItem,
+          SmartDialog.dismiss,
+        ),
         child: Column(
           children: [
             ClipRRect(
-              borderRadius: const BorderRadius.only(
-                topLeft: StyleString.imgRadius,
-                topRight: StyleString.imgRadius,
-                bottomLeft: StyleString.imgRadius,
-                bottomRight: StyleString.imgRadius,
-              ),
+              borderRadius: const BorderRadius.all(StyleString.imgRadius),
               child: AspectRatio(
                 aspectRatio: StyleString.aspectRatio,
                 child: LayoutBuilder(builder: (context, boxConstraints) {
@@ -108,7 +110,7 @@ class LiveContent extends StatelessWidget {
             RichText(
               text: TextSpan(
                 children: [
-                  for (var i in liveItem.title) ...[
+                  for (var i in liveItem.titleList) ...[
                     TextSpan(
                       text: i['text'],
                       style: TextStyle(
diff --git a/lib/pages/search_panel/widgets/media_bangumi_panel.dart b/lib/pages/search_panel/widgets/media_bangumi_panel.dart
index 18799d3a..5bba0ab8 100644
--- a/lib/pages/search_panel/widgets/media_bangumi_panel.dart
+++ b/lib/pages/search_panel/widgets/media_bangumi_panel.dart
@@ -7,6 +7,7 @@ import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/utils.dart';
 
 Widget searchMbangumiPanel(BuildContext context, ctr, list) {
@@ -63,7 +64,7 @@ Widget searchMbangumiPanel(BuildContext context, ctr, list) {
                         style: TextStyle(
                             color: Theme.of(context).colorScheme.onSurface),
                         children: [
-                          for (var i in i.title) ...[
+                          for (var i in i.titleList) ...[
                             TextSpan(
                               text: i['text'],
                               style: TextStyle(
@@ -108,28 +109,8 @@ Widget searchMbangumiPanel(BuildContext context, ctr, list) {
                     SizedBox(
                       height: 32,
                       child: ElevatedButton(
-                        onPressed: () async {
-                          SmartDialog.showLoading(msg: '获取中...');
-                          var res = await SearchHttp.bangumiInfo(
-                              seasonId: i.seasonId);
-                          SmartDialog.dismiss().then((value) {
-                            if (res['status']) {
-                              EpisodeItem episode = res['data'].episodes.first;
-                              String bvid = episode.bvid!;
-                              int cid = episode.cid!;
-                              String pic = episode.cover!;
-                              String heroTag = Utils.makeHeroTag(cid);
-                              Get.toNamed(
-                                '/video?bvid=$bvid&cid=$cid&seasonId=${i.seasonId}',
-                                arguments: {
-                                  'pic': pic,
-                                  'heroTag': heroTag,
-                                  'videoType': SearchType.media_bangumi,
-                                  'bangumiItem': res['data'],
-                                },
-                              );
-                            }
-                          });
+                        onPressed: () {
+                          RoutePush.bangumiPush(i.seasonId, null);
                         },
                         child: const Text('观看'),
                       ),
diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart
index b96ff004..bc9b48c9 100644
--- a/lib/pages/search_panel/widgets/video_panel.dart
+++ b/lib/pages/search_panel/widgets/video_panel.dart
@@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/pages/search/widgets/search_text.dart';
 import 'package:pilipala/pages/search_panel/index.dart';
 
 class SearchVideoPanel extends StatelessWidget {
@@ -35,7 +36,11 @@ class SearchVideoPanel extends StatelessWidget {
                 padding: index == 0
                     ? const EdgeInsets.only(top: 2)
                     : EdgeInsets.zero,
-                child: VideoCardH(videoItem: i, showPubdate: true),
+                child: VideoCardH(
+                  videoItem: i,
+                  showPubdate: true,
+                  source: 'search',
+                ),
               );
             },
           ),
@@ -88,9 +93,9 @@ class SearchVideoPanel extends StatelessWidget {
                 height: 32,
                 child: IconButton(
                   style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
                   ),
-                  onPressed: () => controller.onShowFilterDialog(ctr),
+                  onPressed: () => controller.onShowFilterSheet(ctr),
                   icon: Icon(
                     Icons.filter_list_outlined,
                     size: 18,
@@ -161,7 +166,33 @@ class VideoPanelController extends GetxController {
     {'label': '30-60分钟', 'value': 3},
     {'label': '60分钟+', 'value': 4},
   ];
+  List<Map<String, dynamic>> partFiltersList = [
+    {'label': '全部', 'value': -1},
+    {'label': '动画', 'value': 1},
+    {'label': '番剧', 'value': 13},
+    {'label': '国创', 'value': 167},
+    {'label': '音乐', 'value': 3},
+    {'label': '舞蹈', 'value': 129},
+    {'label': '游戏', 'value': 4},
+    {'label': '知识', 'value': 36},
+    {'label': '科技', 'value': 188},
+    {'label': '运动', 'value': 234},
+    {'label': '汽车', 'value': 223},
+    {'label': '生活', 'value': 160},
+    {'label': '美食', 'value': 211},
+    {'label': '动物', 'value': 217},
+    {'label': '鬼畜', 'value': 119},
+    {'label': '时尚', 'value': 155},
+    {'label': '资讯', 'value': 202},
+    {'label': '娱乐', 'value': 5},
+    {'label': '影视', 'value': 181},
+    {'label': '记录', 'value': 177},
+    {'label': '电影', 'value': 23},
+    {'label': '电视', 'value': 11},
+  ];
+
   RxInt currentTimeFilterval = 0.obs;
+  RxInt currentPartFilterval = (-1).obs;
 
   @override
   void onInit() {
@@ -215,4 +246,100 @@ class VideoPanelController extends GetxController {
       },
     );
   }
+
+  onShowFilterSheet(searchPanelCtr) {
+    showModalBottomSheet(
+      context: Get.context!,
+      builder: (context) {
+        return StatefulBuilder(
+          builder: (context, StateSetter setState) {
+            return Container(
+              color: Theme.of(Get.context!).colorScheme.surface,
+              padding: const EdgeInsets.only(top: 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const ListTile(
+                    title: Text('内容时长'),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 14,
+                      right: 14,
+                      bottom: 14,
+                    ),
+                    child: Wrap(
+                      spacing: 10,
+                      runSpacing: 10,
+                      direction: Axis.horizontal,
+                      textDirection: TextDirection.ltr,
+                      children: [
+                        for (var i in timeFiltersList)
+                          Obx(
+                            () => SearchText(
+                              searchText: i['label'],
+                              searchTextIdx: i['value'],
+                              isSelect:
+                                  currentTimeFilterval.value == i['value'],
+                              onSelect: (value) async {
+                                currentTimeFilterval.value = i['value'];
+                                setState(() {});
+                                SmartDialog.showToast("「${i['label']}」的筛选结果");
+                                SearchPanelController ctr =
+                                    Get.find<SearchPanelController>(
+                                        tag: 'video${searchPanelCtr.keyword!}');
+                                ctr.duration.value = i['value'];
+                                Get.back();
+                                SmartDialog.showLoading(msg: '获取中');
+                                await ctr.onRefresh();
+                                SmartDialog.dismiss();
+                              },
+                              onLongSelect: (value) => {},
+                            ),
+                          )
+                      ],
+                    ),
+                  ),
+                  const ListTile(
+                    title: Text('内容分区'),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(left: 14, right: 14),
+                    child: Wrap(
+                      spacing: 10,
+                      runSpacing: 10,
+                      direction: Axis.horizontal,
+                      textDirection: TextDirection.ltr,
+                      children: [
+                        for (var i in partFiltersList)
+                          SearchText(
+                            searchText: i['label'],
+                            searchTextIdx: i['value'],
+                            isSelect: currentPartFilterval.value == i['value'],
+                            onSelect: (value) async {
+                              currentPartFilterval.value = i['value'];
+                              setState(() {});
+                              SmartDialog.showToast("「${i['label']}」的筛选结果");
+                              SearchPanelController ctr =
+                                  Get.find<SearchPanelController>(
+                                      tag: 'video${searchPanelCtr.keyword!}');
+                              ctr.tids.value = i['value'];
+                              Get.back();
+                              SmartDialog.showLoading(msg: '获取中');
+                              await ctr.onRefresh();
+                              SmartDialog.dismiss();
+                            },
+                            onLongSelect: (value) => {},
+                          )
+                      ],
+                    ),
+                  )
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
 }
diff --git a/lib/pages/search_result/controller.dart b/lib/pages/search_result/controller.dart
index 9914d82b..02a9e63b 100644
--- a/lib/pages/search_result/controller.dart
+++ b/lib/pages/search_result/controller.dart
@@ -1,8 +1,11 @@
 import 'package:get/get.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/common/search_type.dart';
 
 class SearchResultController extends GetxController {
   String? keyword;
   int tabIndex = 0;
+  RxList searchTabs = [].obs;
 
   @override
   void onInit() {
@@ -10,5 +13,21 @@ class SearchResultController extends GetxController {
     if (Get.parameters.keys.isNotEmpty) {
       keyword = Get.parameters['keyword'];
     }
+    searchTabs.value = SearchType.values
+        .map((type) => {'label': type.label, 'id': type.type})
+        .toList();
+    querySearchCount();
+  }
+
+  Future querySearchCount() async {
+    var result = await SearchHttp.searchCount(keyword: keyword!);
+    if (result['status']) {
+      for (var i in searchTabs) {
+        final count = result['data'].topTList[i['id']];
+        i['count'] = count > 99 ? '99+' : count.toString();
+      }
+      searchTabs.refresh();
+    }
+    return result;
   }
 }
diff --git a/lib/pages/search_result/view.dart b/lib/pages/search_result/view.dart
index ff5bf780..96fdd91d 100644
--- a/lib/pages/search_result/view.dart
+++ b/lib/pages/search_result/view.dart
@@ -13,7 +13,7 @@ class SearchResultPage extends StatefulWidget {
 
 class _SearchResultPageState extends State<SearchResultPage>
     with TickerProviderStateMixin {
-  late SearchResultController? _searchResultController;
+  late SearchResultController _searchResultController;
   late TabController? _tabController;
 
   @override
@@ -25,7 +25,7 @@ class _SearchResultPageState extends State<SearchResultPage>
     _tabController = TabController(
       vsync: this,
       length: SearchType.values.length,
-      initialIndex: _searchResultController!.tabIndex,
+      initialIndex: _searchResultController.tabIndex,
     );
   }
 
@@ -46,7 +46,7 @@ class _SearchResultPageState extends State<SearchResultPage>
           child: SizedBox(
             width: double.infinity,
             child: Text(
-              '${_searchResultController!.keyword}',
+              '${_searchResultController.keyword}',
               style: Theme.of(context).textTheme.titleMedium,
             ),
           ),
@@ -64,35 +64,39 @@ class _SearchResultPageState extends State<SearchResultPage>
                 splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明
                 highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明
               ),
-              child: TabBar(
-                controller: _tabController,
-                tabs: [
-                  for (var i in SearchType.values) Tab(text: i.label),
-                ],
-                isScrollable: true,
-                indicatorWeight: 0,
-                indicatorPadding:
-                    const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
-                indicator: BoxDecoration(
-                  color: Theme.of(context).colorScheme.secondaryContainer,
-                  borderRadius: const BorderRadius.all(Radius.circular(20)),
-                ),
-                indicatorSize: TabBarIndicatorSize.tab,
-                labelColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                labelStyle: const TextStyle(fontSize: 13),
-                dividerColor: Colors.transparent,
-                unselectedLabelColor: Theme.of(context).colorScheme.outline,
-                tabAlignment: TabAlignment.start,
-                onTap: (index) {
-                  if (index == _searchResultController!.tabIndex) {
-                    Get.find<SearchPanelController>(
-                            tag: SearchType.values[index].type +
-                                _searchResultController!.keyword!)
-                        .animateToTop();
-                  }
+              child: Obx(
+                () => (TabBar(
+                  controller: _tabController,
+                  tabs: [
+                    for (var i in _searchResultController.searchTabs)
+                      Tab(text: "${i['label']} ${i['count'] ?? ''}")
+                  ],
+                  isScrollable: true,
+                  indicatorWeight: 0,
+                  indicatorPadding:
+                      const EdgeInsets.symmetric(horizontal: 3, vertical: 8),
+                  indicator: BoxDecoration(
+                    color: Theme.of(context).colorScheme.secondaryContainer,
+                    borderRadius: const BorderRadius.all(Radius.circular(20)),
+                  ),
+                  indicatorSize: TabBarIndicatorSize.tab,
+                  labelColor:
+                      Theme.of(context).colorScheme.onSecondaryContainer,
+                  labelStyle: const TextStyle(fontSize: 13),
+                  dividerColor: Colors.transparent,
+                  unselectedLabelColor: Theme.of(context).colorScheme.outline,
+                  tabAlignment: TabAlignment.start,
+                  onTap: (index) {
+                    if (index == _searchResultController.tabIndex) {
+                      Get.find<SearchPanelController>(
+                              tag: SearchType.values[index].type +
+                                  _searchResultController.keyword!)
+                          .animateToTop();
+                    }
 
-                  _searchResultController!.tabIndex = index;
-                },
+                    _searchResultController.tabIndex = index;
+                  },
+                )),
               ),
             ),
           ),
@@ -102,7 +106,7 @@ class _SearchResultPageState extends State<SearchResultPage>
               children: [
                 for (var i in SearchType.values) ...{
                   SearchPanel(
-                    keyword: _searchResultController!.keyword,
+                    keyword: _searchResultController.keyword,
                     searchType: i,
                     tag: DateTime.now().millisecondsSinceEpoch.toString(),
                   )
diff --git a/lib/pages/setting/extra_setting.dart b/lib/pages/setting/extra_setting.dart
index aaaa8b84..885a831c 100644
--- a/lib/pages/setting/extra_setting.dart
+++ b/lib/pages/setting/extra_setting.dart
@@ -240,10 +240,10 @@ class _ExtraSettingState extends State<ExtraSetting> {
               alignment: Alignment.centerRight,
               scale: 0.8,
               child: Switch(
-                thumbIcon: MaterialStateProperty.resolveWith<Icon?>(
-                    (Set<MaterialState> states) {
+                thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
+                    (Set<WidgetState> states) {
                   if (states.isNotEmpty &&
-                      states.first == MaterialState.selected) {
+                      states.first == WidgetState.selected) {
                     return const Icon(Icons.done);
                   }
                   return null; // All other states will use the default thumbIcon.
diff --git a/lib/pages/setting/pages/action_menu_set.dart b/lib/pages/setting/pages/action_menu_set.dart
new file mode 100644
index 00000000..7a4fd9ba
--- /dev/null
+++ b/lib/pages/setting/pages/action_menu_set.dart
@@ -0,0 +1,102 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/models/common/action_type.dart';
+import 'package:pilipala/utils/global_data.dart';
+import '../../../utils/storage.dart';
+
+class ActionMenuSetPage extends StatefulWidget {
+  const ActionMenuSetPage({super.key});
+
+  @override
+  State<ActionMenuSetPage> createState() => _ActionMenuSetPageState();
+}
+
+class _ActionMenuSetPageState extends State<ActionMenuSetPage> {
+  Box setting = GStrorage.setting;
+  late List<String> actionTypeSort;
+  late List<Map> allLabels;
+
+  @override
+  void initState() {
+    super.initState();
+    actionTypeSort = setting.get(SettingBoxKey.actionTypeSort,
+        defaultValue: ['like', 'coin', 'collect', 'watchLater', 'share']);
+    allLabels = actionMenuConfig;
+    allLabels.sort((a, b) {
+      int indexA = actionTypeSort.indexOf((a['value'] as ActionType).value);
+      int indexB = actionTypeSort.indexOf((b['value'] as ActionType).value);
+      if (indexA == -1) indexA = actionTypeSort.length;
+      if (indexB == -1) indexB = actionTypeSort.length;
+      return indexA.compareTo(indexB);
+    });
+  }
+
+  void saveEdit() {
+    List<String> sortedTabbar = allLabels
+        .where((i) => actionTypeSort.contains((i['value'] as ActionType).value))
+        .map<String>((i) => (i['value'] as ActionType).value)
+        .toList();
+    setting.put(SettingBoxKey.actionTypeSort, sortedTabbar);
+    GlobalData().actionTypeSort = sortedTabbar;
+    SmartDialog.showToast('操作成功');
+  }
+
+  void onReorder(int oldIndex, int newIndex) {
+    setState(() {
+      if (newIndex > oldIndex) {
+        newIndex -= 1;
+      }
+      final tabsItem = allLabels.removeAt(oldIndex);
+      allLabels.insert(newIndex, tabsItem);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final listTiles = [
+      for (int i = 0; i < allLabels.length; i++) ...[
+        CheckboxListTile(
+          key: Key((allLabels[i]['value'] as ActionType).value),
+          value: actionTypeSort
+              .contains((allLabels[i]['value'] as ActionType).value),
+          onChanged: (bool? newValue) {
+            String actionTypeId = (allLabels[i]['value'] as ActionType).value;
+            if (!newValue!) {
+              actionTypeSort.remove(actionTypeId);
+            } else {
+              actionTypeSort.add(actionTypeId);
+            }
+            setState(() {});
+          },
+          title: Row(
+            children: [
+              allLabels[i]['icon'],
+              const SizedBox(width: 8),
+              Text(allLabels[i]['label']),
+            ],
+          ),
+          secondary: const Icon(Icons.drag_indicator_rounded),
+        )
+      ]
+    ];
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('视频操作菜单'),
+        actions: [
+          TextButton(onPressed: () => saveEdit(), child: const Text('保存')),
+          const SizedBox(width: 12)
+        ],
+      ),
+      body: ReorderableListView(
+        onReorder: onReorder,
+        physics: const NeverScrollableScrollPhysics(),
+        footer: SizedBox(
+          height: MediaQuery.of(context).padding.bottom + 30,
+        ),
+        children: listTiles,
+      ),
+    );
+  }
+}
diff --git a/lib/pages/setting/pages/font_size_select.dart b/lib/pages/setting/pages/font_size_select.dart
index 4985c83f..f5ca6be3 100644
--- a/lib/pages/setting/pages/font_size_select.dart
+++ b/lib/pages/setting/pages/font_size_select.dart
@@ -66,7 +66,7 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
                           .colorScheme
                           .primary
                           .withOpacity(0.3))),
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
             ),
             child: Row(
               children: [
diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart
index 0958edb8..f497aee5 100644
--- a/lib/pages/setting/pages/logs.dart
+++ b/lib/pages/setting/pages/logs.dart
@@ -41,7 +41,8 @@ class _LogsPageState extends State<LogsPage> {
           .replaceAll('DEVICE INFO', '设备信息')
           .replaceAll('APP INFO', '应用信息')
           .replaceAll('ERROR', '错误信息')
-          .replaceAll('STACK TRACE', '错误堆栈');
+          .replaceAll('STACK TRACE', '错误堆栈')
+          .replaceAll('#', 'Line');
     }).toList();
     List<Map<String, dynamic>> result = [];
     for (String i in contentList) {
@@ -50,7 +51,7 @@ class _LogsPageState extends State<LogsPage> {
           .split("\n")
           .map((l) {
             if (l.startsWith("Crash occurred on")) {
-              date = DateTime.parse(
+              date = DateTime.tryParse(
                 l.split("Crash occurred on")[1].trim().split('.')[0],
               );
               return "";
diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart
index 07d736e3..4a8495e5 100644
--- a/lib/pages/setting/play_setting.dart
+++ b/lib/pages/setting/play_setting.dart
@@ -131,7 +131,7 @@ class _PlaySettingState extends State<PlaySetting> {
             title: '开启硬解',
             subTitle: '以较低功耗播放视频',
             setKey: SettingBoxKey.enableHA,
-            defaultVal: true,
+            defaultVal: false,
           ),
           const SetSwitchItem(
             title: '观看人数',
diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index 364eabf0..b6ee5041 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -69,10 +69,10 @@ class _StyleSettingState extends State<StyleSetting> {
                 alignment: Alignment.centerRight,
                 scale: 0.8,
                 child: Switch(
-                    thumbIcon: MaterialStateProperty.resolveWith<Icon?>(
-                        (Set<MaterialState> states) {
+                    thumbIcon: WidgetStateProperty.resolveWith<Icon?>(
+                        (Set<WidgetState> states) {
                       if (states.isNotEmpty &&
-                          states.first == MaterialState.selected) {
+                          states.first == WidgetState.selected) {
                         return const Icon(Icons.done);
                       }
                       return null; // All other states will use the default thumbIcon.
@@ -289,6 +289,11 @@ class _StyleSettingState extends State<StyleSetting> {
             onTap: () => Get.toNamed('/navbarSetting'),
             title: Text('底部导航栏设置', style: titleStyle),
           ),
+          // ListTile(
+          //   dense: false,
+          //   onTap: () => Get.toNamed('/actionMenuSet'),
+          //   title: Text('操作菜单设置', style: titleStyle),
+          // ),
           if (Platform.isAndroid)
             ListTile(
               dense: false,
diff --git a/lib/pages/setting/widgets/select_dialog.dart b/lib/pages/setting/widgets/select_dialog.dart
index 50229f9e..ab5f2ce4 100644
--- a/lib/pages/setting/widgets/select_dialog.dart
+++ b/lib/pages/setting/widgets/select_dialog.dart
@@ -29,7 +29,7 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
 
     return AlertDialog(
       title: Text(widget.title),
-      contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
+      contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
       content: StatefulBuilder(builder: (context, StateSetter setState) {
         return SingleChildScrollView(
           child: Column(
diff --git a/lib/pages/setting/widgets/switch_item.dart b/lib/pages/setting/widgets/switch_item.dart
index d0c2bbf2..36c4433e 100644
--- a/lib/pages/setting/widgets/switch_item.dart
+++ b/lib/pages/setting/widgets/switch_item.dart
@@ -70,9 +70,9 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
         alignment: Alignment.centerRight, // 缩放Switch的大小后保持右侧对齐, 避免右侧空隙过大
         scale: 0.8,
         child: Switch(
-          thumbIcon: MaterialStateProperty.resolveWith<Icon?>(
-              (Set<MaterialState> states) {
-            if (states.isNotEmpty && states.first == MaterialState.selected) {
+          thumbIcon:
+              WidgetStateProperty.resolveWith<Icon?>((Set<WidgetState> states) {
+            if (states.isNotEmpty && states.first == WidgetState.selected) {
               return const Icon(Icons.done);
             }
             return null; // All other states will use the default thumbIcon.
diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart
index 7be8d22c..d8a76d44 100644
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@@ -17,10 +17,15 @@ class SubController extends GetxController {
   int pageSize = 20;
   RxBool hasMore = true.obs;
 
-  Future<dynamic> querySubFolder({type = 'init'}) async {
+  @override
+  void onInit() {
+    super.onInit();
     userInfo = userInfoCache.get('userInfoCache');
+  }
+
+  Future<dynamic> querySubFolder({type = 'init'}) async {
     if (userInfo == null) {
-      return {'status': false, 'msg': '账号未登录'};
+      return {'status': false, 'msg': '账号未登录', 'code': -101};
     }
     var res = await UserHttp.userSubFolder(
       pn: currentPage,
diff --git a/lib/pages/subscription/view.dart b/lib/pages/subscription/view.dart
index 2d7d0cb5..e1d1820d 100644
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/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:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'controller.dart';
 import 'widgets/item.dart';
 
@@ -51,32 +53,54 @@ class _SubPageState extends State<SubPage> {
           if (snapshot.connectionState == ConnectionState.done) {
             Map? data = snapshot.data;
             if (data != null && data['status']) {
-              return Obx(
-                () => ListView.builder(
-                  controller: scrollController,
-                  itemCount: _subController.subFolderData.value.list!.length,
-                  itemBuilder: (context, index) {
-                    return SubItem(
-                        subFolderItem:
-                            _subController.subFolderData.value.list![index],
-                        cancelSub: _subController.cancelSub);
-                  },
-                ),
-              );
+              if (_subController.subFolderData.value.list!.isNotEmpty) {
+                return Obx(
+                  () => ListView.builder(
+                    controller: scrollController,
+                    itemCount: _subController.subFolderData.value.list!.length,
+                    itemBuilder: (context, index) {
+                      return SubItem(
+                          subFolderItem:
+                              _subController.subFolderData.value.list![index],
+                          cancelSub: _subController.cancelSub);
+                    },
+                  ),
+                );
+              } else {
+                return const CustomScrollView(
+                  physics: NeverScrollableScrollPhysics(),
+                  slivers: [HttpError(errMsg: '', btnText: '没有数据', fn: null)],
+                );
+              }
             } else {
               return CustomScrollView(
                 physics: const NeverScrollableScrollPhysics(),
                 slivers: [
                   HttpError(
-                    errMsg: data?['msg'],
-                    fn: () => setState(() {}),
+                    errMsg: data?['msg'] ?? '请求异常',
+                    btnText: data?['code'] == -101 ? '去登录' : null,
+                    fn: () {
+                      if (data?['code'] == -101) {
+                        RoutePush.loginRedirectPush();
+                      } else {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _subController.querySubFolder();
+                        });
+                      }
+                    },
                   ),
                 ],
               );
             }
           } else {
             // 骨架屏
-            return const Text('请求中');
+            return ListView.builder(
+              itemBuilder: (context, index) {
+                return const VideoCardHSkeleton();
+              },
+              itemCount: 10,
+            );
           }
         },
       ),
diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart
index 5b2a0134..6c1cc2b9 100644
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@@ -25,6 +25,7 @@ class SubItem extends StatelessWidget {
         parameters: {
           'heroTag': heroTag,
           'seasonId': subFolderItem.id.toString(),
+          'type': subFolderItem.type.toString(),
         },
       ),
       child: Padding(
@@ -113,16 +114,15 @@ class VideoContent extends StatelessWidget {
             Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                SizedBox(
-                  height: 35,
-                  width: 35,
-                  child: IconButton(
-                    onPressed: () => cancelSub?.call(subFolderItem),
-                    style: TextButton.styleFrom(
-                      foregroundColor: Theme.of(context).colorScheme.outline,
-                      padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
-                    ),
-                    icon: const Icon(Icons.delete_outline, size: 18),
+                IconButton(
+                  style: ButtonStyle(
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
+                  ),
+                  onPressed: () => cancelSub?.call(subFolderItem),
+                  icon: Icon(
+                    Icons.clear_outlined,
+                    color: Theme.of(context).colorScheme.outline,
+                    size: 18,
                   ),
                 )
               ],
diff --git a/lib/pages/subscription_detail/controller.dart b/lib/pages/subscription_detail/controller.dart
index 4245df2c..e69f4be0 100644
--- a/lib/pages/subscription_detail/controller.dart
+++ b/lib/pages/subscription_detail/controller.dart
@@ -14,13 +14,16 @@ class SubDetailController extends GetxController {
   RxList<SubDetailMediaItem> subList = <SubDetailMediaItem>[].obs;
   RxString loadingText = '加载中...'.obs;
   int mediaCount = 0;
+  late int channelType;
 
   @override
   void onInit() {
     item = Get.arguments;
-    if (Get.parameters.keys.isNotEmpty) {
-      seasonId = int.parse(Get.parameters['seasonId']!);
-      heroTag = Get.parameters['heroTag']!;
+    final parameters = Get.parameters;
+    if (parameters.isNotEmpty) {
+      seasonId = int.tryParse(parameters['seasonId'] ?? '') ?? 0;
+      heroTag = parameters['heroTag'] ?? '';
+      channelType = int.tryParse(parameters['type'] ?? '') ?? 0;
     }
     super.onInit();
   }
@@ -31,7 +34,7 @@ class SubDetailController extends GetxController {
       return;
     }
     isLoadingMore = true;
-    var res = type == 21
+    var res = channelType == 21
         ? await UserHttp.userSeasonList(
             seasonId: seasonId,
             ps: 20,
diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart
index 63352429..4ca241fe 100644
--- a/lib/pages/subscription_detail/view.dart
+++ b/lib/pages/subscription_detail/view.dart
@@ -198,8 +198,8 @@ class _SubDetailPageState extends State<SubDetailPage> {
             future: _futureBuilderFuture,
             builder: (context, snapshot) {
               if (snapshot.connectionState == ConnectionState.done) {
-                Map data = snapshot.data;
-                if (data['status']) {
+                Map? data = snapshot.data;
+                if (data != null && data['status']) {
                   if (_subDetailController.item.mediaCount == 0) {
                     return const NoData();
                   } else {
@@ -219,7 +219,7 @@ class _SubDetailPageState extends State<SubDetailPage> {
                   }
                 } else {
                   return HttpError(
-                    errMsg: data['msg'],
+                    errMsg: data?['msg'] ?? '请求异常',
                     fn: () => setState(() {}),
                   );
                 }
diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart
index 11aebc39..dcdee4ef 100644
--- a/lib/pages/subscription_detail/widget/sub_video_card.dart
+++ b/lib/pages/subscription_detail/widget/sub_video_card.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:pilipala/common/constants.dart';
@@ -5,6 +6,7 @@ import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/utils/image_save.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import '../../../common/widgets/badge.dart';
@@ -40,6 +42,11 @@ class SubVideoCardH extends StatelessWidget {
           'videoType': SearchType.video,
         });
       },
+      onLongPress: () => imageSaveDialog(
+        context,
+        videoItem,
+        SmartDialog.dismiss,
+      ),
       child: Column(
         children: [
           Padding(
diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart
index 4d40e535..38c62d7e 100644
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@@ -51,7 +51,7 @@ class VideoDetailController extends GetxController
   /// 播放器配置 画质 音质 解码格式
   late VideoQuality currentVideoQa;
   AudioQuality? currentAudioQa;
-  late VideoDecodeFormats currentDecodeFormats;
+  VideoDecodeFormats? currentDecodeFormats;
   // 是否开始自动播放 存在多p的情况下，第二p需要为true
   RxBool autoPlay = true.obs;
   // 视频资源是否有效
@@ -59,7 +59,7 @@ class VideoDetailController extends GetxController
   // 封面图的展示
   RxBool isShowCover = true.obs;
   // 硬解
-  RxBool enableHA = true.obs;
+  RxBool enableHA = false.obs;
 
   /// 本地存储
   Box userInfoCache = GStrorage.userInfo;
@@ -73,7 +73,8 @@ class VideoDetailController extends GetxController
   ReplyItemModel? firstFloor;
   final scaffoldKey = GlobalKey<ScaffoldState>();
   RxString bgCover = ''.obs;
-  PlPlayerController plPlayerController = PlPlayerController.getInstance();
+  RxString cover = ''.obs;
+  PlPlayerController plPlayerController = PlPlayerController();
 
   late VideoItem firstVideo;
   late AudioItem firstAudio;
@@ -107,28 +108,26 @@ class VideoDetailController extends GetxController
     BottomControlType.fullscreen,
   ].obs;
   RxDouble sheetHeight = 0.0.obs;
+  RxString archiveSourceType = 'dash'.obs;
 
   @override
   void onInit() {
     super.onInit();
     final Map argMap = Get.arguments;
     userInfo = userInfoCache.get('userInfoCache');
-    var keys = argMap.keys.toList();
-    if (keys.isNotEmpty) {
-      if (keys.contains('videoItem')) {
-        var args = argMap['videoItem'];
-        if (args.pic != null && args.pic != '') {
-          videoItem['pic'] = args.pic;
-        }
-      }
-      if (keys.contains('pic')) {
-        videoItem['pic'] = argMap['pic'];
-      }
+    if (argMap.containsKey('videoItem')) {
+      var args = argMap['videoItem'];
+      updateCover(args.pic);
     }
+
+    if (argMap.containsKey('pic')) {
+      updateCover(argMap['pic']);
+    }
+
     tabCtr = TabController(length: 2, vsync: this);
     autoPlay.value =
         setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
-    enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true);
+    enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: false);
     enableRelatedVideo =
         setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true);
     if (userInfo == null ||
@@ -161,11 +160,11 @@ class VideoDetailController extends GetxController
     getSubtitle();
   }
 
-  showReplyReplyPanel() {
+  showReplyReplyPanel(oid, fRpid, firstFloor) {
     replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
-        oid: oid.value,
+        oid: oid,
         rpid: fRpid,
         closePanel: () => {
           fRpid = 0,
@@ -189,37 +188,43 @@ class VideoDetailController extends GetxController
     plPlayerController.isBuffering.value = false;
     plPlayerController.buffered.value = Duration.zero;
 
-    /// 根据currentVideoQa和currentDecodeFormats 重新设置videoUrl
-    List<VideoItem> videoList =
-        data.dash!.video!.where((i) => i.id == currentVideoQa.code).toList();
-    try {
-      firstVideo = videoList
-          .firstWhere((i) => i.codecs!.startsWith(currentDecodeFormats.code));
-    } catch (_) {
-      if (currentVideoQa == VideoQuality.dolbyVision) {
-        firstVideo = videoList.first;
-        currentDecodeFormats =
-            VideoDecodeFormatsCode.fromString(videoList.first.codecs!)!;
-      } else {
-        // 当前格式不可用
-        currentDecodeFormats = VideoDecodeFormatsCode.fromString(setting.get(
-            SettingBoxKey.defaultDecode,
-            defaultValue: VideoDecodeFormats.values.last.code))!;
-        firstVideo = videoList
-            .firstWhere((i) => i.codecs!.startsWith(currentDecodeFormats.code));
+    if (archiveSourceType.value == 'dash') {
+      /// 根据currentVideoQa和currentDecodeFormats 重新设置videoUrl
+      List<VideoItem> videoList =
+          data.dash!.video!.where((i) => i.id == currentVideoQa.code).toList();
+      try {
+        firstVideo = videoList.firstWhere(
+            (i) => i.codecs!.startsWith(currentDecodeFormats?.code));
+      } catch (_) {
+        if (currentVideoQa == VideoQuality.dolbyVision) {
+          firstVideo = videoList.first;
+          currentDecodeFormats =
+              VideoDecodeFormatsCode.fromString(videoList.first.codecs!)!;
+        } else {
+          // 当前格式不可用
+          currentDecodeFormats = VideoDecodeFormatsCode.fromString(setting.get(
+              SettingBoxKey.defaultDecode,
+              defaultValue: VideoDecodeFormats.values.last.code))!;
+          firstVideo = videoList.firstWhere(
+              (i) => i.codecs!.startsWith(currentDecodeFormats?.code));
+        }
+      }
+      videoUrl = firstVideo.baseUrl!;
+
+      /// 根据currentAudioQa 重新设置audioUrl
+      if (currentAudioQa != null) {
+        final AudioItem firstAudio = data.dash!.audio!.firstWhere(
+          (AudioItem i) => i.id == currentAudioQa!.code,
+          orElse: () => data.dash!.audio!.first,
+        );
+        audioUrl = firstAudio.baseUrl ?? '';
       }
     }
-    videoUrl = firstVideo.baseUrl!;
 
-    /// 根据currentAudioQa 重新设置audioUrl
-    if (currentAudioQa != null) {
-      final AudioItem firstAudio = data.dash!.audio!.firstWhere(
-        (AudioItem i) => i.id == currentAudioQa!.code,
-        orElse: () => data.dash!.audio!.first,
-      );
-      audioUrl = firstAudio.baseUrl ?? '';
+    if (archiveSourceType.value == 'durl') {
+      cacheVideoQa = VideoQualityCode.toCode(currentVideoQa);
+      queryVideoUrl();
     }
-
     playerInit();
   }
 
@@ -228,7 +233,7 @@ class VideoDetailController extends GetxController
     audio,
     seekToTime,
     duration,
-    bool autoplay = true,
+    bool? autoplay,
   }) async {
     /// 设置/恢复 屏幕亮度
     if (brightness != null) {
@@ -261,7 +266,7 @@ class VideoDetailController extends GetxController
       cid: cid.value,
       enableHeart: enableHeart,
       isFirstTime: isFirstTime,
-      autoplay: autoplay,
+      autoplay: autoplay ?? autoPlay.value,
     );
 
     /// 开启自动全屏时，在player初始化完成后立即传入headerControl
@@ -272,7 +277,8 @@ class VideoDetailController extends GetxController
 
   // 视频链接
   Future queryVideoUrl() async {
-    var result = await VideoHttp.videoUrl(cid: cid.value, bvid: bvid);
+    var result =
+        await VideoHttp.videoUrl(cid: cid.value, bvid: bvid, qn: cacheVideoQa);
     if (result['status']) {
       data = result['data'];
       if (data.acceptDesc!.isNotEmpty && data.acceptDesc!.contains('试看')) {
@@ -290,8 +296,22 @@ class VideoDetailController extends GetxController
         }
         return result;
       }
+      if (data.durl != null) {
+        archiveSourceType.value = 'durl';
+        videoUrl = data.durl!.first.url!;
+        audioUrl = '';
+        defaultST = Duration.zero;
+        firstVideo = VideoItem();
+        currentVideoQa = VideoQualityCode.fromCode(data.quality!)!;
+        if (autoPlay.value) {
+          await playerInit();
+          isShowCover.value = false;
+        }
+        return result;
+      }
       final List<VideoItem> allVideosList = data.dash!.video!;
       try {
+        archiveSourceType.value = 'dash';
         // 当前可播放的最高质量视频
         int currentHighVideoQa = allVideosList.first.quality!.code;
         // 预设的画质为null，则当前可用的最高质量
@@ -321,7 +341,7 @@ class VideoDetailController extends GetxController
           // 当前视频没有对应格式返回第一个
           bool flag = false;
           for (var i in supportDecodeFormats) {
-            if (i.startsWith(currentDecodeFormats.code)) {
+            if (i.startsWith(currentDecodeFormats?.code)) {
               flag = true;
             }
           }
@@ -335,7 +355,7 @@ class VideoDetailController extends GetxController
         /// 取出符合当前解码格式的videoItem
         try {
           firstVideo = videosList.firstWhere(
-              (e) => e.codecs!.startsWith(currentDecodeFormats.code));
+              (e) => e.codecs!.startsWith(currentDecodeFormats?.code));
         } catch (_) {
           firstVideo = videosList.first;
         }
@@ -525,4 +545,10 @@ class VideoDetailController extends GetxController
       },
     );
   }
+
+  void updateCover(String? pic) {
+    if (pic != null) {
+      cover.value = videoItem['pic'] = pic;
+    }
+  }
 }
diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart
index 6469b5c5..9c542f21 100644
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -38,6 +38,8 @@ class VideoIntroController extends GetxController {
   RxBool hasCoin = false.obs;
   // 是否收藏
   RxBool hasFav = false.obs;
+  // 是否不喜欢
+  RxBool hasDisLike = false.obs;
   Box userInfoCache = GStrorage.userInfo;
   bool userLogin = false;
   Rx<FavFolderData> favFolderData = FavFolderData().obs;
@@ -90,6 +92,7 @@ class VideoIntroController extends GetxController {
       final VideoDetailController videoDetailCtr =
           Get.find<VideoDetailController>(tag: heroTag);
       videoDetailCtr.tabs.value = ['简介', '评论 ${result['data']?.stat?.reply}'];
+      videoDetailCtr.cover.value = result['data'].pic ?? '';
       // 获取到粉丝数再返回
       await queryUserStat();
     }
@@ -152,36 +155,16 @@ class VideoIntroController extends GetxController {
       SmartDialog.showToast('🙏 UP已经收到了～');
       return false;
     }
-    SmartDialog.show(
-      useSystem: true,
-      animationType: SmartAnimationType.centerFade_otherSlide,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('提示'),
-          content: const Text('一键三连 给UP送温暖'),
-          actions: [
-            TextButton(
-                onPressed: () => SmartDialog.dismiss(),
-                child: const Text('点错了')),
-            TextButton(
-              onPressed: () async {
-                var result = await VideoHttp.oneThree(bvid: bvid);
-                if (result['status']) {
-                  hasLike.value = result["data"]["like"];
-                  hasCoin.value = result["data"]["coin"];
-                  hasFav.value = result["data"]["fav"];
-                  SmartDialog.showToast('三连成功 🎉');
-                } else {
-                  SmartDialog.showToast(result['msg']);
-                }
-                SmartDialog.dismiss();
-              },
-              child: const Text('确认'),
-            )
-          ],
-        );
-      },
-    );
+    var result = await VideoHttp.oneThree(bvid: bvid);
+    print('🤣🦴：${result["data"]}');
+    if (result['status']) {
+      hasLike.value = result["data"]["like"];
+      hasCoin.value = result["data"]["coin"];
+      hasFav.value = result["data"]["fav"];
+      SmartDialog.showToast('三连成功');
+    } else {
+      SmartDialog.showToast(result['msg']);
+    }
   }
 
   // （取消）点赞
@@ -192,9 +175,8 @@ class VideoIntroController extends GetxController {
     }
     var result = await VideoHttp.likeVideo(bvid: bvid, type: !hasLike.value);
     if (result['status']) {
-      // hasLike.value = result["data"] == 1 ? true : false;
       if (!hasLike.value) {
-        SmartDialog.showToast('点赞成功 👍');
+        SmartDialog.showToast('点赞成功');
         hasLike.value = true;
         videoDetail.value.stat!.like = videoDetail.value.stat!.like! + 1;
       } else if (hasLike.value) {
@@ -214,55 +196,45 @@ class VideoIntroController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
+    if (hasCoin.value) {
+      SmartDialog.showToast('已投过币了');
+      return;
+    }
     showDialog(
         context: Get.context!,
         builder: (context) {
           return AlertDialog(
             title: const Text('选择投币个数'),
-            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
+            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 24),
             content: StatefulBuilder(builder: (context, StateSetter setState) {
               return Column(
                 mainAxisSize: MainAxisSize.min,
-                children: [
-                  RadioListTile(
-                    value: 1,
-                    title: const Text('1枚'),
-                    groupValue: _tempThemeValue,
-                    onChanged: (value) {
-                      _tempThemeValue = value!;
-                      Get.appUpdate();
-                    },
-                  ),
-                  RadioListTile(
-                    value: 2,
-                    title: const Text('2枚'),
-                    groupValue: _tempThemeValue,
-                    onChanged: (value) {
-                      _tempThemeValue = value!;
-                      Get.appUpdate();
-                    },
-                  ),
-                ],
+                children: [1, 2]
+                    .map(
+                      (e) => RadioListTile(
+                        value: e,
+                        title: Text('$e枚'),
+                        groupValue: _tempThemeValue,
+                        onChanged: (value) async {
+                          _tempThemeValue = value!;
+                          setState(() {});
+                          var res = await VideoHttp.coinVideo(
+                              bvid: bvid, multiply: _tempThemeValue);
+                          if (res['status']) {
+                            SmartDialog.showToast('投币成功');
+                            hasCoin.value = true;
+                            videoDetail.value.stat!.coin =
+                                videoDetail.value.stat!.coin! + _tempThemeValue;
+                          } else {
+                            SmartDialog.showToast(res['msg']);
+                          }
+                          Get.back();
+                        },
+                      ),
+                    )
+                    .toList(),
               );
             }),
-            actions: [
-              TextButton(onPressed: () => Get.back(), child: const Text('取消')),
-              TextButton(
-                  onPressed: () async {
-                    var res = await VideoHttp.coinVideo(
-                        bvid: bvid, multiply: _tempThemeValue);
-                    if (res['status']) {
-                      SmartDialog.showToast('投币成功 👏');
-                      hasCoin.value = true;
-                      videoDetail.value.stat!.coin =
-                          videoDetail.value.stat!.coin! + _tempThemeValue;
-                    } else {
-                      SmartDialog.showToast(res['msg']);
-                    }
-                    Get.back();
-                  },
-                  child: const Text('确定'))
-            ],
           );
         });
   }
@@ -282,7 +254,7 @@ class VideoIntroController extends GetxController {
       if (result['status']) {
         // 重新获取收藏状态
         await queryHasFavVideo();
-        SmartDialog.showToast('✅ 操作成功');
+        SmartDialog.showToast('操作成功');
       } else {
         SmartDialog.showToast(result['msg']);
       }
@@ -312,7 +284,7 @@ class VideoIntroController extends GetxController {
       Get.back();
       // 重新获取收藏状态
       await queryHasFavVideo();
-      SmartDialog.showToast('✅ 操作成功');
+      SmartDialog.showToast('操作成功');
     } else {
       SmartDialog.showToast(result['msg']);
     }
@@ -446,7 +418,7 @@ class VideoIntroController extends GetxController {
   }
 
   // 修改分P或番剧分集
-  Future changeSeasonOrbangu(bvid, cid, aid) async {
+  Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
@@ -461,7 +433,9 @@ class VideoIntroController extends GetxController {
     videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
+    videoDetailCtr.cover.value = cover;
     videoDetailCtr.queryVideoUrl();
+    videoDetailCtr.getSubtitle();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常
@@ -508,6 +482,7 @@ class VideoIntroController extends GetxController {
   void nextPlay() {
     final List episodes = [];
     bool isPages = false;
+    late String cover;
     if (videoDetail.value.ugcSeason != null) {
       final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
       final List<SectionItem> sections = ugcSeason.sections!;
@@ -524,6 +499,7 @@ class VideoIntroController extends GetxController {
     final int currentIndex =
         episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int nextIndex = currentIndex + 1;
+    cover = episodes[nextIndex].cover;
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
     final PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
@@ -540,7 +516,7 @@ class VideoIntroController extends GetxController {
     final int cid = episodes[nextIndex].cid!;
     final String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
     final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
-    changeSeasonOrbangu(rBvid, cid, rAid);
+    changeSeasonOrbangu(rBvid, cid, rAid, cover);
   }
 
   // 设置关注分组
@@ -605,10 +581,11 @@ class VideoIntroController extends GetxController {
         isFullScreen: true,
         changeFucCall: (item, index) {
           if (dataType == VideoEpidoesType.videoEpisode) {
-            changeSeasonOrbangu(IdUtils.av2bv(item.aid), item.cid, item.aid);
+            changeSeasonOrbangu(
+                IdUtils.av2bv(item.aid), item.cid, item.aid, item.cover);
           }
           if (dataType == VideoEpidoesType.videoPart) {
-            changeSeasonOrbangu(bvid, item.cid, null);
+            changeSeasonOrbangu(bvid, item.cid, null, item.cover);
           }
           SmartDialog.dismiss();
         },
diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart
index a7eae6d2..3b89d1de 100644
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -1,9 +1,11 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:expandable/expandable.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:lottie/lottie.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
@@ -14,6 +16,7 @@ import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/introduction/controller.dart';
 import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../../../http/user.dart';
@@ -22,6 +25,7 @@ import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
 import 'widgets/page_panel.dart';
 import 'widgets/season_panel.dart';
+import 'widgets/staff_up_item.dart';
 
 class VideoIntroPanel extends StatefulWidget {
   final String bvid;
@@ -95,11 +99,14 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             );
           }
         } else {
-          return const SliverToBoxAdapter(
+          return SliverToBoxAdapter(
             child: SizedBox(
               height: 100,
               child: Center(
-                child: CircularProgressIndicator(),
+                child: Lottie.asset(
+                  'assets/loading.json',
+                  width: 200,
+                ),
               ),
             ),
           );
@@ -134,7 +141,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   late double sheetHeight;
   late final dynamic owner;
   late final dynamic follower;
-  late final dynamic followStatus;
   late int mid;
   late String memberHeroTag;
   late bool enableAi;
@@ -142,13 +148,18 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   RxBool isExpand = false.obs;
   late ExpandableController _expandableCtr;
 
-  void Function()? handleState(Future Function() action) {
+  // 一键三连动画
+  late AnimationController _controller;
+  late Animation<double> _scaleTransition;
+  final RxDouble _progress = 0.0.obs;
+
+  void Function()? handleState(Future<dynamic> Function() action) {
     return isProcessing
         ? null
         : () async {
-            setState(() => isProcessing = true);
-            await action();
-            setState(() => isProcessing = false);
+            isProcessing = true;
+            await action.call();
+            isProcessing = false;
           };
   }
 
@@ -163,9 +174,28 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
     owner = widget.videoDetail!.owner;
     follower = Utils.numFormat(videoIntroController.userStat['follower']);
-    followStatus = videoIntroController.followStatus;
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
     _expandableCtr = ExpandableController(initialExpanded: false);
+
+    /// 一键三连动画
+    _controller = AnimationController(
+      duration: const Duration(milliseconds: 1500),
+      reverseDuration: const Duration(milliseconds: 300),
+      vsync: this,
+    );
+    _scaleTransition = Tween<double>(begin: 0.5, end: 1.5).animate(_controller)
+      ..addListener(() async {
+        _progress.value =
+            double.parse((_scaleTransition.value - 0.5).toStringAsFixed(3));
+        if (_progress.value == 1) {
+          if (_controller.status == AnimationStatus.completed) {
+            await videoIntroController.actionOneThree();
+          }
+          _progress.value = 0;
+          _scaleTransition.removeListener(() {});
+          _controller.stop();
+        }
+      });
   }
 
   // 收藏
@@ -246,6 +276,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   @override
   void dispose() {
     _expandableCtr.dispose();
+    _controller.dispose();
+    _scaleTransition.removeListener(() {});
     super.dispose();
   }
 
@@ -266,6 +298,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
           GestureDetector(
             behavior: HitTestBehavior.translucent,
             onTap: () => showIntroDetail(),
+            onLongPress: () async {
+              feedBack();
+              await Clipboard.setData(
+                  ClipboardData(text: widget.videoDetail!.title!));
+              SmartDialog.showToast('标题已复制');
+            },
             child: ExpandablePanel(
               controller: _expandableCtr,
               collapsed: Text(
@@ -382,11 +420,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     ? videoIntroController.lastPlayCid.value
                     : widget.videoDetail!.pages!.first.cid,
                 sheetHeight: videoDetailCtr.sheetHeight.value,
-                changeFuc: (bvid, cid, aid) =>
+                changeFuc: (bvid, cid, aid, cover) =>
                     videoIntroController.changeSeasonOrbangu(
                   bvid,
                   cid,
                   aid,
+                  cover,
                 ),
                 videoIntroCtr: videoIntroController,
               ),
@@ -400,147 +439,294 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                 pages: widget.videoDetail!.pages!,
                 cid: videoIntroController.lastPlayCid.value,
                 sheetHeight: videoDetailCtr.sheetHeight.value,
-                changeFuc: (cid) => videoIntroController.changeSeasonOrbangu(
+                changeFuc: (cid, cover) =>
+                    videoIntroController.changeSeasonOrbangu(
                   videoIntroController.bvid,
                   cid,
                   null,
+                  cover,
                 ),
                 videoIntroCtr: videoIntroController,
               ),
             )
           ],
-          GestureDetector(
-            onTap: onPushMember,
-            child: Container(
-              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
-              child: Row(
-                children: [
-                  NetworkImgLayer(
-                    type: 'avatar',
-                    src: widget.videoDetail!.owner!.face,
-                    width: 34,
-                    height: 34,
-                    fadeInDuration: Duration.zero,
-                    fadeOutDuration: Duration.zero,
-                  ),
-                  const SizedBox(width: 10),
-                  Text(owner.name, style: const TextStyle(fontSize: 13)),
-                  const SizedBox(width: 6),
-                  Text(
-                    follower,
-                    style: TextStyle(
-                      fontSize: t.textTheme.labelSmall!.fontSize,
-                      color: outline,
+          if (widget.videoDetail!.staff == null)
+            GestureDetector(
+              onTap: onPushMember,
+              child: Container(
+                padding:
+                    const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
+                child: Row(
+                  children: [
+                    NetworkImgLayer(
+                      type: 'avatar',
+                      src: widget.videoDetail!.owner!.face,
+                      width: 34,
+                      height: 34,
+                      fadeInDuration: Duration.zero,
+                      fadeOutDuration: Duration.zero,
                     ),
-                  ),
-                  const Spacer(),
-                  Obx(() => AnimatedOpacity(
-                        opacity:
-                            videoIntroController.followStatus.isEmpty ? 0 : 1,
-                        duration: const Duration(milliseconds: 50),
-                        child: SizedBox(
-                          height: 32,
-                          child: Obx(
-                            () => videoIntroController.followStatus.isNotEmpty
-                                ? TextButton(
-                                    onPressed:
-                                        videoIntroController.actionRelationMod,
-                                    style: TextButton.styleFrom(
-                                      padding: const EdgeInsets.only(
-                                          left: 8, right: 8),
-                                      foregroundColor:
-                                          followStatus['attribute'] != 0
-                                              ? outline
-                                              : t.colorScheme.onPrimary,
-                                      backgroundColor:
-                                          followStatus['attribute'] != 0
-                                              ? t.colorScheme.onInverseSurface
-                                              : t.colorScheme
-                                                  .primary, // 设置按钮背景色
+                    const SizedBox(width: 10),
+                    Text(owner.name, style: const TextStyle(fontSize: 13)),
+                    const SizedBox(width: 6),
+                    Text(
+                      follower,
+                      style: TextStyle(
+                        fontSize: t.textTheme.labelSmall!.fontSize,
+                        color: outline,
+                      ),
+                    ),
+                    const Spacer(),
+                    Obx(
+                      () {
+                        final bool isFollowed =
+                            videoIntroController.followStatus['attribute'] != 0;
+                        return videoIntroController.followStatus.isEmpty
+                            ? const SizedBox()
+                            : SizedBox(
+                                height: 32,
+                                child: TextButton(
+                                  onPressed:
+                                      videoIntroController.actionRelationMod,
+                                  style: TextButton.styleFrom(
+                                    padding: const EdgeInsets.only(
+                                      left: 8,
+                                      right: 8,
                                     ),
-                                    child: Text(
-                                      followStatus['attribute'] != 0
-                                          ? '已关注'
-                                          : '关注',
-                                      style: TextStyle(
-                                          fontSize: t
-                                              .textTheme.labelMedium!.fontSize),
-                                    ),
-                                  )
-                                : ElevatedButton(
-                                    onPressed:
-                                        videoIntroController.actionRelationMod,
-                                    child: const Text('关注'),
+                                    foregroundColor: isFollowed
+                                        ? outline
+                                        : t.colorScheme.onPrimary,
+                                    backgroundColor: isFollowed
+                                        ? t.colorScheme.onInverseSurface
+                                        : t.colorScheme.primary, // 设置按钮背景色
                                   ),
-                          ),
-                        ),
-                      )),
-                ],
+                                  child: Text(
+                                    isFollowed ? '已关注' : '关注',
+                                    style: TextStyle(
+                                      fontSize:
+                                          t.textTheme.labelMedium!.fontSize,
+                                    ),
+                                  ),
+                                ),
+                              );
+                      },
+                    )
+                  ],
+                ),
               ),
             ),
-          ),
+          if (widget.videoDetail!.staff != null) ...[
+            const SizedBox(height: 15),
+            Column(
+              mainAxisAlignment: MainAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text.rich(
+                  TextSpan(
+                    style: TextStyle(
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                    ),
+                    children: [
+                      TextSpan(
+                        text: '创作团队',
+                        style: Theme.of(context)
+                            .textTheme
+                            .titleSmall!
+                            .copyWith(fontWeight: FontWeight.bold),
+                      ),
+                      const WidgetSpan(child: SizedBox(width: 6)),
+                      TextSpan(
+                        text: '${widget.videoDetail!.staff!.length}人',
+                        style: TextStyle(
+                          color: Theme.of(context).colorScheme.outline,
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+                SizedBox(
+                  height: 120,
+                  child: ListView(
+                    scrollDirection: Axis.horizontal,
+                    children: [
+                      for (int i = 0;
+                          i < widget.videoDetail!.staff!.length;
+                          i++) ...[
+                        StaffUpItem(item: widget.videoDetail!.staff![i])
+                      ],
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ]
         ],
       )),
     );
   }
 
   Widget actionGrid(BuildContext context, videoIntroController) {
+    final actionTypeSort = GlobalData().actionTypeSort;
+
+    Widget progressWidget(progress) {
+      return SizedBox(
+        width: 33,
+        height: 33,
+        child: CircularProgressIndicator(
+          value: progress.value,
+          strokeWidth: 2,
+        ),
+      );
+    }
+
+    Map<String, Widget> menuListWidgets = {
+      'like': Obx(
+        () {
+          bool likeStatus = videoIntroController.hasLike.value;
+          ColorScheme colorScheme = Theme.of(context).colorScheme;
+          return Stack(
+            children: [
+              Positioned(child: progressWidget(_progress), top: 15, left: 24),
+              InkWell(
+                onTapDown: (details) {
+                  feedBack();
+                  // if (videoIntroController.userInfo == null) {
+                  //   SmartDialog.showToast('账号未登录');
+                  //   return;
+                  // }
+                  _controller.forward();
+                },
+                onTapUp: (TapUpDetails details) {
+                  if (_progress.value == 0) {
+                    feedBack();
+                    EasyThrottle.throttle(
+                        'my-throttler', const Duration(milliseconds: 200), () {
+                      videoIntroController.actionLikeVideo();
+                    });
+                  }
+                  _controller.reverse();
+                },
+                borderRadius: StyleString.mdRadius,
+                child: SizedBox(
+                  width: (Get.size.width - 24) / 5,
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      const SizedBox(height: 4),
+                      AnimatedSwitcher(
+                        duration: const Duration(milliseconds: 300),
+                        transitionBuilder:
+                            (Widget child, Animation<double> animation) {
+                          return ScaleTransition(
+                              scale: animation, child: child);
+                        },
+                        child: Icon(
+                          key: ValueKey<bool>(likeStatus),
+                          likeStatus
+                              ? Icons.thumb_up
+                              : Icons.thumb_up_alt_outlined,
+                          color: likeStatus
+                              ? colorScheme.primary
+                              : colorScheme.outline,
+                        ),
+                      ),
+                      const SizedBox(height: 6),
+                      Text(
+                        widget.videoDetail!.stat!.like!.toString(),
+                        style: TextStyle(
+                          color: likeStatus ? colorScheme.primary : null,
+                          fontSize:
+                              Theme.of(context).textTheme.labelSmall!.fontSize,
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+      'coin': Obx(
+        () => Stack(
+          children: [
+            Positioned(child: progressWidget(_progress), top: 15, left: 24),
+            ActionItem(
+              icon: Image.asset('assets/images/coin.png', width: 30),
+              onTap: handleState(videoIntroController.actionCoinVideo),
+              selectStatus: videoIntroController.hasCoin.value,
+              text: widget.videoDetail!.stat!.coin!.toString(),
+            ),
+          ],
+        ),
+      ),
+      'collect': Obx(
+        () => Stack(
+          children: [
+            Positioned(child: progressWidget(_progress), top: 15, left: 24),
+            ActionItem(
+              icon: const Icon(Icons.star_border),
+              selectIcon: const Icon(Icons.star),
+              onTap: () => showFavBottomSheet(),
+              onLongPress: () => showFavBottomSheet(type: 'longPress'),
+              selectStatus: videoIntroController.hasFav.value,
+              text: widget.videoDetail!.stat!.favorite!.toString(),
+            ),
+          ],
+        ),
+      ),
+      'watchLater': ActionItem(
+        icon: const Icon(Icons.watch_later_outlined),
+        onTap: () async {
+          final res =
+              await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid);
+          SmartDialog.showToast(res['msg']);
+        },
+        selectStatus: false,
+        text: '稍后看',
+      ),
+      'share': ActionItem(
+        icon: const Icon(Icons.share),
+        onTap: () => videoIntroController.actionShareVideo(),
+        selectStatus: false,
+        text: '分享',
+      ),
+      'dislike': Obx(
+        () => ActionItem(
+          icon: const Icon(Icons.thumb_down_alt_outlined),
+          selectIcon: const Icon(Icons.thumb_down),
+          onTap: () {},
+          selectStatus: videoIntroController.hasDisLike.value,
+          text: '不喜欢',
+        ),
+      ),
+      'downloadCover': ActionItem(
+        icon: const Icon(Icons.image_outlined),
+        onTap: () {},
+        selectStatus: false,
+        text: '下载封面',
+      ),
+      'copyLink': ActionItem(
+        icon: const Icon(Icons.link_outlined),
+        onTap: () {},
+        selectStatus: false,
+        text: '复制链接',
+      ),
+    };
+    final List<Widget> list = [];
+    for (var i = 0; i < actionTypeSort.length; i++) {
+      list.add(menuListWidgets[actionTypeSort[i]]!);
+    }
+
     return LayoutBuilder(
         builder: (BuildContext context, BoxConstraints constraints) {
       return Container(
         margin: const EdgeInsets.only(top: 6, bottom: 4),
-        height: constraints.maxWidth / 5 * 0.8,
-        child: GridView.count(
-          physics: const NeverScrollableScrollPhysics(),
-          primary: false,
-          padding: EdgeInsets.zero,
-          crossAxisCount: 5,
-          childAspectRatio: 1.25,
-          children: <Widget>[
-            Obx(
-              () => ActionItem(
-                  icon: const Icon(FontAwesomeIcons.thumbsUp),
-                  selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                  onTap: handleState(videoIntroController.actionLikeVideo),
-                  selectStatus: videoIntroController.hasLike.value,
-                  text: widget.videoDetail!.stat!.like!.toString()),
-            ),
-            Obx(
-              () => ActionItem(
-                icon: const Icon(FontAwesomeIcons.b),
-                selectIcon: const Icon(FontAwesomeIcons.b),
-                onTap: handleState(videoIntroController.actionCoinVideo),
-                selectStatus: videoIntroController.hasCoin.value,
-                text: widget.videoDetail!.stat!.coin!.toString(),
-              ),
-            ),
-            Obx(
-              () => ActionItem(
-                icon: const Icon(FontAwesomeIcons.star),
-                selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                onTap: () => showFavBottomSheet(),
-                onLongPress: () => showFavBottomSheet(type: 'longPress'),
-                selectStatus: videoIntroController.hasFav.value,
-                text: widget.videoDetail!.stat!.favorite!.toString(),
-              ),
-            ),
-            ActionItem(
-              icon: const Icon(FontAwesomeIcons.clock),
-              onTap: () async {
-                final res =
-                    await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid);
-                SmartDialog.showToast(res['msg']);
-              },
-              selectStatus: false,
-              text: '稍后看',
-            ),
-            ActionItem(
-              icon: const Icon(FontAwesomeIcons.shareFromSquare),
-              onTap: () => videoIntroController.actionShareVideo(),
-              selectStatus: false,
-              text: '分享',
-            ),
-          ],
+        height: constraints.maxWidth / 5,
+        child: ListView(
+          scrollDirection: Axis.horizontal,
+          children: list,
         ),
       );
     });
diff --git a/lib/pages/video/detail/introduction/widgets/action_item.dart b/lib/pages/video/detail/introduction/widgets/action_item.dart
index 022d9223..af409dfc 100644
--- a/lib/pages/video/detail/introduction/widgets/action_item.dart
+++ b/lib/pages/video/detail/introduction/widgets/action_item.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/utils/feed_back.dart';
 
 class ActionItem extends StatelessWidget {
-  final Icon? icon;
+  final dynamic icon;
   final Icon? selectIcon;
   final Function? onTap;
   final Function? onLongPress;
@@ -31,26 +32,46 @@ class ActionItem extends StatelessWidget {
         if (onLongPress != null) {onLongPress!()}
       },
       borderRadius: StyleString.mdRadius,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          const SizedBox(height: 4),
-          selectStatus
-              ? Icon(selectIcon!.icon!,
-                  size: 18, color: Theme.of(context).colorScheme.primary)
-              : Icon(icon!.icon!,
-                  size: 18, color: Theme.of(context).colorScheme.outline),
-          const SizedBox(height: 6),
-          Text(
-            text ?? '',
-            style: TextStyle(
-              color: selectStatus
-                  ? Theme.of(context).colorScheme.primary
-                  : Theme.of(context).colorScheme.outline,
-              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+      child: SizedBox(
+        width: (Get.size.width - 24) / 5,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            const SizedBox(height: 4),
+            AnimatedSwitcher(
+              duration: const Duration(milliseconds: 300),
+              transitionBuilder: (Widget child, Animation<double> animation) {
+                return ScaleTransition(scale: animation, child: child);
+              },
+              child: icon is Icon
+                  ? Icon(
+                      selectStatus
+                          ? selectIcon!.icon ?? icon!.icon
+                          : icon!.icon,
+                      color: selectStatus
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).colorScheme.outline,
+                    )
+                  : Image.asset(
+                      key: ValueKey<bool>(selectStatus),
+                      'assets/images/coin.png',
+                      width: 25,
+                      color: selectStatus
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).colorScheme.outline,
+                    ),
             ),
-          )
-        ],
+            const SizedBox(height: 6),
+            Text(
+              text ?? '',
+              style: TextStyle(
+                color:
+                    selectStatus ? Theme.of(context).colorScheme.primary : null,
+                fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/video/detail/introduction/widgets/fav_panel.dart
index 517caeaa..5ef78967 100644
--- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart
@@ -29,7 +29,7 @@ class _FavPanelState extends State<FavPanel> {
   Widget build(BuildContext context) {
     return Container(
       height: sheetHeight,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: Column(
         children: [
           AppBar(
diff --git a/lib/pages/video/detail/introduction/widgets/group_panel.dart b/lib/pages/video/detail/introduction/widgets/group_panel.dart
index 64ff913d..dcdaf9c5 100644
--- a/lib/pages/video/detail/introduction/widgets/group_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/group_panel.dart
@@ -57,7 +57,7 @@ class _GroupPanelState extends State<GroupPanel> {
   Widget build(BuildContext context) {
     return Container(
       height: sheetHeight,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: Column(
         children: <Widget>[
           AppBar(
diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
index 1e9bb842..78c621c0 100644
--- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart
+++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class IntroDetail extends StatelessWidget {
@@ -16,26 +17,47 @@ class IntroDetail extends StatelessWidget {
   Widget build(BuildContext context) {
     return SizedBox(
       width: double.infinity,
-      child: SelectableRegion(
-        focusNode: FocusNode(),
-        selectionControls: MaterialTextSelectionControls(),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            const SizedBox(height: 4),
-            GestureDetector(
-              onTap: () {
-                Clipboard.setData(ClipboardData(text: videoDetail!.bvid!));
-                SmartDialog.showToast('已复制');
-              },
-              child: Text(
-                videoDetail!.bvid!,
-                style: TextStyle(
-                    fontSize: 13, color: Theme.of(context).colorScheme.primary),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          const SizedBox(height: 4),
+          Row(
+            children: [
+              GestureDetector(
+                onTap: () {
+                  feedBack();
+                  Clipboard.setData(ClipboardData(text: videoDetail!.bvid!));
+                  SmartDialog.showToast('已复制');
+                },
+                child: Text(
+                  videoDetail!.bvid!,
+                  style: TextStyle(
+                      fontSize: 13,
+                      color: Theme.of(context).colorScheme.primary),
+                ),
               ),
-            ),
-            const SizedBox(height: 4),
-            Text.rich(
+              const SizedBox(width: 10),
+              GestureDetector(
+                onTap: () {
+                  feedBack();
+                  Clipboard.setData(
+                      ClipboardData(text: videoDetail!.aid!.toString()));
+                  SmartDialog.showToast('已复制');
+                },
+                child: Text(
+                  videoDetail!.aid!.toString(),
+                  style: TextStyle(
+                      fontSize: 13,
+                      color: Theme.of(context).colorScheme.primary),
+                ),
+              )
+            ],
+          ),
+          const SizedBox(height: 4),
+          SelectableRegion(
+            focusNode: FocusNode(),
+            selectionControls: MaterialTextSelectionControls(),
+            child: Text.rich(
               style: const TextStyle(height: 1.4),
               TextSpan(
                 children: [
@@ -43,8 +65,8 @@ class IntroDetail extends StatelessWidget {
                 ],
               ),
             ),
-          ],
-        ),
+          ),
+        ],
       ),
     );
   }
diff --git a/lib/pages/video/detail/introduction/widgets/menu_row.dart b/lib/pages/video/detail/introduction/widgets/menu_row.dart
index c175aff1..a26c86f0 100644
--- a/lib/pages/video/detail/introduction/widgets/menu_row.dart
+++ b/lib/pages/video/detail/introduction/widgets/menu_row.dart
@@ -12,7 +12,7 @@ class MenuRow extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       padding: const EdgeInsets.only(top: 9, bottom: 9, left: 12),
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
@@ -84,7 +84,7 @@ class MenuRow extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 13,
                       color: selectStatus
-                          ? Theme.of(context).colorScheme.onBackground
+                          ? Theme.of(context).colorScheme.onSurface
                           : Theme.of(context).colorScheme.outline),
                 ),
               ),
diff --git a/lib/pages/video/detail/introduction/widgets/page_panel.dart b/lib/pages/video/detail/introduction/widgets/page_panel.dart
index 83db2d52..c8111847 100644
--- a/lib/pages/video/detail/introduction/widgets/page_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/page_panel.dart
@@ -58,7 +58,7 @@ class _PagesPanelState extends State<PagesPanel> {
   }
 
   void changeFucCall(item, i) async {
-    widget.changeFuc?.call(item.cid);
+    widget.changeFuc?.call(item.cid, item.cover);
     currentIndex.value = i;
     _bottomSheetController?.close();
     scrollToIndex();
@@ -106,7 +106,7 @@ class _PagesPanelState extends State<PagesPanel> {
                 height: 34,
                 child: TextButton(
                   style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
                   ),
                   onPressed: () {
                     widget.videoIntroCtr.bottomSheetController =
@@ -129,7 +129,7 @@ class _PagesPanelState extends State<PagesPanel> {
           ),
         ),
         Container(
-          height: 35,
+          height: 55,
           margin: const EdgeInsets.only(bottom: 8),
           child: ListView.builder(
             scrollDirection: Axis.horizontal,
@@ -163,7 +163,7 @@ class _PagesPanelState extends State<PagesPanel> {
                           Expanded(
                               child: Text(
                             widget.pages[i].pagePart!,
-                            maxLines: 1,
+                            maxLines: 2,
                             style: TextStyle(
                                 fontSize: 13,
                                 color: isCurrentIndex
diff --git a/lib/pages/video/detail/introduction/widgets/season_panel.dart b/lib/pages/video/detail/introduction/widgets/season_panel.dart
index 2afefcb4..fdfec6f9 100644
--- a/lib/pages/video/detail/introduction/widgets/season_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/season_panel.dart
@@ -67,6 +67,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
       IdUtils.av2bv(item.aid),
       item.cid,
       item.aid,
+      item.cover,
     );
     currentIndex.value = i;
     _bottomSheetController?.close();
diff --git a/lib/pages/video/detail/introduction/widgets/staff_up_item.dart b/lib/pages/video/detail/introduction/widgets/staff_up_item.dart
new file mode 100644
index 00000000..7b18d95d
--- /dev/null
+++ b/lib/pages/video/detail/introduction/widgets/staff_up_item.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/video_detail_res.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class StaffUpItem extends StatelessWidget {
+  final Staff item;
+
+  const StaffUpItem({
+    super.key,
+    required this.item,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final String heroTag = Utils.makeHeroTag(item.mid);
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        const SizedBox(height: 15),
+        GestureDetector(
+          onTap: () => Get.toNamed(
+            '/member?mid=${item.mid}',
+            arguments: {'face': item.face, 'heroTag': heroTag},
+          ),
+          child: Hero(
+            tag: heroTag,
+            child: NetworkImgLayer(
+              width: 45,
+              height: 45,
+              src: item.face,
+              type: 'avatar',
+            ),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 4),
+          child: SizedBox(
+            width: 85,
+            child: Text(
+              item.name!,
+              overflow: TextOverflow.ellipsis,
+              softWrap: false,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: item.vip!.status == 1
+                    ? const Color.fromARGB(255, 251, 100, 163)
+                    : null,
+              ),
+            ),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 4),
+          child: SizedBox(
+            width: 85,
+            child: Text(
+              item.title!,
+              overflow: TextOverflow.ellipsis,
+              softWrap: false,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.outline,
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/detail/related/view.dart
index 0912724e..fe3b0dca 100644
--- a/lib/pages/video/detail/related/view.dart
+++ b/lib/pages/video/detail/related/view.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
 import './controller.dart';
 
@@ -54,20 +52,6 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel>
                       child: VideoCardH(
                         videoItem: relatedVideoList[index],
                         showPubdate: true,
-                        longPress: () {
-                          try {
-                            _releatedController.popupDialog =
-                                _createPopupDialog(_releatedController
-                                    .relatedVideoList[index]);
-                            Overlay.of(context)
-                                .insert(_releatedController.popupDialog!);
-                          } catch (err) {
-                            return {};
-                          }
-                        },
-                        longPressEnd: () {
-                          _releatedController.popupDialog?.remove();
-                        },
                       ),
                     );
                   }
@@ -89,15 +73,4 @@ class _RelatedVideoPanelState extends State<RelatedVideoPanel>
       },
     );
   }
-
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (BuildContext context) => AnimatedDialog(
-        closeFn: _releatedController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem,
-            closeFn: _releatedController.popupDialog?.remove),
-      ),
-    );
-  }
 }
diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart
index 06ce26ff..c1929434 100644
--- a/lib/pages/video/detail/reply/controller.dart
+++ b/lib/pages/video/detail/reply/controller.dart
@@ -1,5 +1,4 @@
 import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/reply.dart';
@@ -15,7 +14,6 @@ class VideoReplyController extends GetxController {
     this.rpid,
     this.replyLevel,
   );
-  final ScrollController scrollController = ScrollController();
   // 视频aid 请求时使用的oid
   int? aid;
   // 层级 2为楼中楼
@@ -37,6 +35,7 @@ class VideoReplyController extends GetxController {
   RxString sortTypeLabel = ReplySortType.time.labels.obs;
 
   Box setting = GStrorage.setting;
+  RxInt replyReqCode = 200.obs;
 
   @override
   void onInit() {
@@ -106,6 +105,7 @@ class VideoReplyController extends GetxController {
         replyList.addAll(replies);
       }
     }
+    replyReqCode.value = res['code'];
     isLoadingMore = false;
     return res;
   }
diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/detail/reply/view.dart
index 2a167fe9..653fe7e0 100644
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@@ -67,13 +67,12 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
         vsync: this, duration: const Duration(milliseconds: 300));
 
     _futureBuilderFuture = _videoReplyController.queryReplyList();
-
+    scrollController = ScrollController();
     fabAnimationCtr.forward();
     scrollListener();
   }
 
   void scrollListener() {
-    scrollController = _videoReplyController.scrollController;
     scrollController.addListener(
       () {
         if (scrollController.position.pixels >=
@@ -117,7 +116,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       videoDetailCtr.oid.value = replyItem.oid;
       videoDetailCtr.fRpid = replyItem.rpid!;
       videoDetailCtr.firstFloor = replyItem;
-      videoDetailCtr.showReplyReplyPanel();
+      videoDetailCtr.showReplyReplyPanel(
+          replyItem.oid, replyItem.rpid!, replyItem);
     }
   }
 
@@ -184,7 +184,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 builder: (BuildContext context, snapshot) {
                   if (snapshot.connectionState == ConnectionState.done) {
                     var data = snapshot.data;
-                    if (data['status']) {
+                    if (_videoReplyController.replyList.isNotEmpty ||
+                        (data && data['status'])) {
                       // 请求成功
                       return Obx(
                         () => _videoReplyController.isLoadingMore &&
@@ -276,32 +277,39 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 parent: fabAnimationCtr,
                 curve: Curves.easeInOut,
               )),
-              child: FloatingActionButton(
-                heroTag: null,
-                onPressed: () {
-                  feedBack();
-                  showModalBottomSheet(
-                    context: context,
-                    isScrollControlled: true,
-                    builder: (BuildContext context) {
-                      return VideoReplyNewDialog(
-                        oid: _videoReplyController.aid ??
-                            IdUtils.bv2av(Get.parameters['bvid']!),
-                        root: 0,
-                        parent: 0,
-                        replyType: ReplyType.video,
-                      );
-                    },
-                  ).then(
-                    (value) => {
-                      // 完成评论，数据添加
-                      if (value != null && value['data'] != null)
-                        {_videoReplyController.replyList.add(value['data'])}
-                    },
-                  );
-                },
-                tooltip: '发表评论',
-                child: const Icon(Icons.reply),
+              child: Obx(
+                () => _videoReplyController.replyReqCode.value == 12061
+                    ? const SizedBox()
+                    : FloatingActionButton(
+                        heroTag: null,
+                        onPressed: () {
+                          feedBack();
+                          showModalBottomSheet(
+                            context: context,
+                            isScrollControlled: true,
+                            builder: (BuildContext context) {
+                              return VideoReplyNewDialog(
+                                oid: _videoReplyController.aid ??
+                                    IdUtils.bv2av(Get.parameters['bvid']!),
+                                root: 0,
+                                parent: 0,
+                                replyType: ReplyType.video,
+                              );
+                            },
+                          ).then(
+                            (value) => {
+                              // 完成评论，数据添加
+                              if (value != null && value['data'] != null)
+                                {
+                                  _videoReplyController.replyList
+                                      .add(value['data'])
+                                }
+                            },
+                          );
+                        },
+                        tooltip: '发表评论',
+                        child: const Icon(Icons.reply),
+                      ),
               ),
             ),
           ),
diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart
index 50fe20d4..08e4d405 100644
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -1,3 +1,4 @@
+import 'package:appscheme/appscheme.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -11,6 +12,7 @@ import 'package:pilipala/models/video/reply/item.dart';
 import 'package:pilipala/pages/preview/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/index.dart';
+import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -59,28 +61,23 @@ class ReplyItem extends StatelessWidget {
             },
           );
         },
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(12, 14, 8, 5),
-              child: content(context),
-            ),
-            Divider(
-              indent: 55,
-              endIndent: 15,
-              height: 0.3,
-              color: Theme.of(context)
-                  .colorScheme
-                  .onInverseSurface
-                  .withOpacity(0.5),
-            )
-          ],
+        child: Container(
+          padding: const EdgeInsets.fromLTRB(12, 14, 8, 5),
+          decoration: BoxDecoration(
+              border: Border(
+                  bottom: BorderSide(
+            width: 1,
+            color:
+                Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.5),
+          ))),
+          child: content(context),
         ),
       ),
     );
   }
 
   Widget lfAvtar(BuildContext context, String heroTag) {
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
     return Stack(
       children: [
         Hero(
@@ -100,11 +97,11 @@ class ReplyItem extends StatelessWidget {
             child: Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(7),
-                color: Theme.of(context).colorScheme.background,
+                color: colorScheme.surface,
               ),
               child: Icon(
                 Icons.offline_bolt,
-                color: Theme.of(context).colorScheme.primary,
+                color: colorScheme.primary,
                 size: 16,
               ),
             ),
@@ -117,7 +114,7 @@ class ReplyItem extends StatelessWidget {
             child: Container(
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(7),
-                color: Theme.of(context).colorScheme.background,
+                color: colorScheme.background,
               ),
               child: Image.asset(
                 'assets/images/big-vip.png',
@@ -131,6 +128,8 @@ class ReplyItem extends StatelessWidget {
 
   Widget content(BuildContext context) {
     final String heroTag = Utils.makeHeroTag(replyItem!.mid);
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+    TextTheme textTheme = Theme.of(context).textTheme;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
@@ -160,16 +159,17 @@ class ReplyItem extends StatelessWidget {
                         style: TextStyle(
                           color: replyItem!.member!.vip!['vipStatus'] > 0
                               ? const Color.fromARGB(255, 251, 100, 163)
-                              : Theme.of(context).colorScheme.outline,
+                              : colorScheme.outline,
                           fontSize: 13,
                         ),
                       ),
-                      const SizedBox(width: 6),
-                      Image.asset(
-                        'assets/images/lv/lv${replyItem!.member!.level}.png',
-                        height: 11,
+                      Padding(
+                        padding: const EdgeInsets.only(left: 6, right: 6),
+                        child: Image.asset(
+                          'assets/images/lv/lv${replyItem!.member!.level}.png',
+                          height: 11,
+                        ),
                       ),
-                      const SizedBox(width: 6),
                       if (replyItem!.isUp!)
                         const PBadge(
                           text: 'UP',
@@ -184,9 +184,8 @@ class ReplyItem extends StatelessWidget {
                       Text(
                         Utils.dateFormat(replyItem!.ctime),
                         style: TextStyle(
-                          fontSize:
-                              Theme.of(context).textTheme.labelSmall!.fontSize,
-                          color: Theme.of(context).colorScheme.outline,
+                          fontSize: textTheme.labelSmall!.fontSize,
+                          color: colorScheme.outline,
                         ),
                       ),
                       if (replyItem!.replyControl != null &&
@@ -194,11 +193,8 @@ class ReplyItem extends StatelessWidget {
                         Text(
                           ' • ${replyItem!.replyControl!.location!}',
                           style: TextStyle(
-                              fontSize: Theme.of(context)
-                                  .textTheme
-                                  .labelSmall!
-                                  .fontSize,
-                              color: Theme.of(context).colorScheme.outline),
+                              fontSize: textTheme.labelSmall!.fontSize,
+                              color: colorScheme.outline),
                         ),
                     ],
                   )
@@ -256,6 +252,8 @@ class ReplyItem extends StatelessWidget {
 
   // 感谢、回复、复制
   Widget bottonAction(BuildContext context, replyControl) {
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+    TextTheme textTheme = Theme.of(context).textTheme;
     return Row(
       children: <Widget>[
         const SizedBox(width: 32),
@@ -287,15 +285,13 @@ class ReplyItem extends StatelessWidget {
             },
             child: Row(children: [
               Icon(Icons.reply,
-                  size: 18,
-                  color:
-                      Theme.of(context).colorScheme.outline.withOpacity(0.8)),
+                  size: 18, color: colorScheme.outline.withOpacity(0.8)),
               const SizedBox(width: 3),
               Text(
                 '回复',
                 style: TextStyle(
-                  fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                  color: Theme.of(context).colorScheme.outline,
+                  fontSize: textTheme.labelMedium!.fontSize,
+                  color: colorScheme.outline,
                 ),
               ),
             ]),
@@ -306,8 +302,8 @@ class ReplyItem extends StatelessWidget {
           Text(
             'up主觉得很赞',
             style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize),
+                color: colorScheme.primary,
+                fontSize: textTheme.labelMedium!.fontSize),
           ),
           const SizedBox(width: 2),
         ],
@@ -316,8 +312,8 @@ class ReplyItem extends StatelessWidget {
           Text(
             '热评',
             style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize),
+                color: colorScheme.primary,
+                fontSize: textTheme.labelMedium!.fontSize),
           ),
         const Spacer(),
         ZanButton(replyItem: replyItem, replyType: replyType),
@@ -347,10 +343,13 @@ class ReplyItemRow extends StatelessWidget {
   Widget build(BuildContext context) {
     final bool isShow = replyControl!.isShow!;
     final int extraRow = replyControl != null && isShow ? 1 : 0;
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+    TextTheme textTheme = Theme.of(context).textTheme;
+
     return Container(
       margin: const EdgeInsets.only(left: 42, right: 4, top: 0),
       child: Material(
-        color: Theme.of(context).colorScheme.onInverseSurface,
+        color: colorScheme.onInverseSurface,
         borderRadius: BorderRadius.circular(6),
         clipBehavior: Clip.hardEdge,
         animationDuration: Duration.zero,
@@ -361,7 +360,9 @@ class ReplyItemRow extends StatelessWidget {
               for (int i = 0; i < replies!.length; i++) ...[
                 InkWell(
                   // 一楼点击评论展开评论详情
-                  onTap: () => replyReply!(replyItem),
+                  // onTap: () {
+                  //   replyReply?.call(replyItem);
+                  // },
                   onLongPress: () {
                     feedBack();
                     showModalBottomSheet(
@@ -379,7 +380,7 @@ class ReplyItemRow extends StatelessWidget {
                       8,
                       i == 0 && (extraRow == 1 || replies!.length > 1) ? 8 : 5,
                       8,
-                      i == 0 && (extraRow == 1 || replies!.length > 1) ? 5 : 6,
+                      6,
                     ),
                     child: Text.rich(
                       overflow: TextOverflow.ellipsis,
@@ -393,7 +394,7 @@ class ReplyItemRow extends StatelessWidget {
                                   .textTheme
                                   .titleSmall!
                                   .fontSize,
-                              color: Theme.of(context).colorScheme.primary,
+                              color: colorScheme.primary,
                             ),
                             recognizer: TapGestureRecognizer()
                               ..onTap = () {
@@ -436,8 +437,7 @@ class ReplyItemRow extends StatelessWidget {
                   child: Text.rich(
                     TextSpan(
                       style: TextStyle(
-                        fontSize:
-                            Theme.of(context).textTheme.labelMedium!.fontSize,
+                        fontSize: textTheme.labelMedium!.fontSize,
                       ),
                       children: [
                         if (replyControl!.upReply!)
@@ -445,7 +445,7 @@ class ReplyItemRow extends StatelessWidget {
                         TextSpan(
                           text: replyControl!.entryText!,
                           style: TextStyle(
-                            color: Theme.of(context).colorScheme.primary,
+                            color: colorScheme.primary,
                           ),
                         )
                       ],
@@ -464,6 +464,7 @@ InlineSpan buildContent(
     BuildContext context, replyItem, replyReply, fReplyItem) {
   final String routePath = Get.currentRoute;
   bool isVideoPage = routePath.startsWith('/video');
+  ColorScheme colorScheme = Theme.of(context).colorScheme;
 
   // replyItem 当前回复内容
   // replyReply 查看二楼回复（回复详情）回调
@@ -564,7 +565,7 @@ InlineSpan buildContent(
           TextSpan(
             text: matchStr,
             style: TextStyle(
-              color: Theme.of(context).colorScheme.primary,
+              color: colorScheme.primary,
             ),
             recognizer: TapGestureRecognizer()
               ..onTap = () {
@@ -584,7 +585,7 @@ InlineSpan buildContent(
             text: ' $matchStr ',
             style: isVideoPage
                 ? TextStyle(
-                    color: Theme.of(context).colorScheme.primary,
+                    color: colorScheme.primary,
                   )
                 : null,
             recognizer: TapGestureRecognizer()
@@ -624,14 +625,14 @@ InlineSpan buildContent(
                   child: Image.network(
                     content.jumpUrl[matchStr]['prefix_icon'],
                     height: 19,
-                    color: Theme.of(context).colorScheme.primary,
+                    color: colorScheme.primary,
                   ),
                 )
               ],
               TextSpan(
                 text: content.jumpUrl[matchStr]['title'],
                 style: TextStyle(
-                  color: Theme.of(context).colorScheme.primary,
+                  color: colorScheme.primary,
                 ),
                 recognizer: TapGestureRecognizer()
                   ..onTap = () async {
@@ -644,32 +645,17 @@ InlineSpan buildContent(
                           '',
                         );
                       } else {
-                        final String redirectUrl =
-                            await UrlUtils.parseRedirectUrl(matchStr);
-                        if (redirectUrl == matchStr) {
-                          Clipboard.setData(ClipboardData(text: matchStr));
-                          SmartDialog.showToast('地址可能有误');
-                          return;
-                        }
-                        final String pathSegment = Uri.parse(redirectUrl).path;
-                        final String lastPathSegment =
-                            pathSegment.split('/').last;
-                        if (lastPathSegment.startsWith('BV')) {
-                          UrlUtils.matchUrlPush(
-                            lastPathSegment,
-                            title,
-                            redirectUrl,
-                          );
-                        } else {
-                          Get.toNamed(
-                            '/webview',
-                            parameters: {
-                              'url': redirectUrl,
-                              'type': 'url',
-                              'pageTitle': title
-                            },
-                          );
-                        }
+                        Uri uri = Uri.parse(matchStr);
+                        SchemeEntity scheme = SchemeEntity(
+                          scheme: uri.scheme,
+                          host: uri.host,
+                          port: uri.port,
+                          path: uri.path,
+                          query: uri.queryParameters,
+                          source: '',
+                          dataString: matchStr,
+                        );
+                        PiliSchame.fullPathPush(scheme);
                       }
                     } else {
                       if (appUrlSchema.startsWith('bilibili://search')) {
@@ -721,7 +707,7 @@ InlineSpan buildContent(
             TextSpan(
               text: matchStr,
               style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
+                color: colorScheme.primary,
               ),
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
@@ -747,7 +733,7 @@ InlineSpan buildContent(
               text: ' $matchStr ',
               style: isVideoPage
                   ? TextStyle(
-                      color: Theme.of(context).colorScheme.primary,
+                      color: colorScheme.primary,
                     )
                   : null,
               recognizer: TapGestureRecognizer()
@@ -786,14 +772,14 @@ InlineSpan buildContent(
                 child: Image.network(
                   content.jumpUrl[patternStr]['prefix_icon'],
                   height: 19,
-                  color: Theme.of(context).colorScheme.primary,
+                  color: colorScheme.primary,
                 ),
               )
             ],
             TextSpan(
               text: content.jumpUrl[patternStr]['title'],
               style: TextStyle(
-                color: Theme.of(context).colorScheme.primary,
+                color: colorScheme.primary,
               ),
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
@@ -997,7 +983,8 @@ class MorePanel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Color errorColor = Theme.of(context).colorScheme.error;
+    ColorScheme colorScheme = Theme.of(context).colorScheme;
+    TextTheme textTheme = Theme.of(context).textTheme;
     return Container(
       padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
       child: Column(
@@ -1013,7 +1000,7 @@ class MorePanel extends StatelessWidget {
                   width: 32,
                   height: 3,
                   decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.outline,
+                      color: colorScheme.outline,
                       borderRadius: const BorderRadius.all(Radius.circular(3))),
                 ),
               ),
@@ -1023,13 +1010,13 @@ class MorePanel extends StatelessWidget {
             onTap: () async => await menuActionHandler('copyAll'),
             minLeadingWidth: 0,
             leading: const Icon(Icons.copy_all_outlined, size: 19),
-            title: Text('复制全部', style: Theme.of(context).textTheme.titleSmall),
+            title: Text('复制全部', style: textTheme.titleSmall),
           ),
           ListTile(
             onTap: () async => await menuActionHandler('copyFreedom'),
             minLeadingWidth: 0,
             leading: const Icon(Icons.copy_outlined, size: 19),
-            title: Text('自由复制', style: Theme.of(context).textTheme.titleSmall),
+            title: Text('自由复制', style: textTheme.titleSmall),
           ),
           // ListTile(
           //   onTap: () async => await menuActionHandler('block'),
diff --git a/lib/pages/video/detail/reply_new/toolbar_icon_button.dart b/lib/pages/video/detail/reply_new/toolbar_icon_button.dart
index c4390796..bf810ce2 100644
--- a/lib/pages/video/detail/reply_new/toolbar_icon_button.dart
+++ b/lib/pages/video/detail/reply_new/toolbar_icon_button.dart
@@ -27,8 +27,8 @@ class ToolbarIconButton extends StatelessWidget {
             ? Theme.of(context).colorScheme.onSecondaryContainer
             : Theme.of(context).colorScheme.outline,
         style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
-          backgroundColor: MaterialStateProperty.resolveWith((states) {
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
+          backgroundColor: WidgetStateProperty.resolveWith((states) {
             return selected
                 ? Theme.of(context).colorScheme.secondaryContainer
                 : null;
diff --git a/lib/pages/video/detail/reply_new/view.dart b/lib/pages/video/detail/reply_new/view.dart
index a94b6071..a136f623 100644
--- a/lib/pages/video/detail/reply_new/view.dart
+++ b/lib/pages/video/detail/reply_new/view.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/video/reply/emote.dart';
@@ -40,6 +41,9 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
   double keyboardHeight = 0.0; // 键盘高度
   final _debouncer = Debouncer(milliseconds: 200); // 设置延迟时间
   String toolbarType = 'input';
+  RxBool isForward = false.obs;
+  RxBool showForward = false.obs;
+  RxString message = ''.obs;
 
   @override
   void initState() {
@@ -52,6 +56,10 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     _autoFocus();
     // 监听聚焦状态
     _focuslistener();
+    final String routePath = Get.currentRoute;
+    if (routePath.startsWith('/video')) {
+      showForward.value = true;
+    }
   }
 
   _autoFocus() async {
@@ -73,21 +81,31 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
 
   Future submitReplyAdd() async {
     feedBack();
-    String message = _replyContentController.text;
+    // String message = _replyContentController.text;
     var result = await VideoHttp.replyAdd(
       type: widget.replyType ?? ReplyType.video,
       oid: widget.oid!,
       root: widget.root!,
       parent: widget.parent!,
       message: widget.replyItem != null && widget.replyItem!.root != 0
-          ? ' 回复 @${widget.replyItem!.member!.uname!} : $message'
-          : message,
+          ? ' 回复 @${widget.replyItem!.member!.uname!} : ${message.value}'
+          : message.value,
     );
     if (result['status']) {
       SmartDialog.showToast(result['data']['success_toast']);
       Get.back(result: {
         'data': ReplyItemModel.fromJson(result['data']['reply'], ''),
       });
+
+      /// 投稿、番剧页面
+      if (isForward.value) {
+        await DynamicsHttp.dynamicCreate(
+          mid: 0,
+          rawText: message.value,
+          oid: widget.oid!,
+          scene: 5,
+        );
+      }
     } else {
       SmartDialog.showToast(result['msg']);
     }
@@ -145,7 +163,6 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
     double _keyboardHeight = EdgeInsets.fromViewPadding(
             View.of(context).viewInsets, View.of(context).devicePixelRatio)
         .bottom;
-    print('_keyboardHeight: $_keyboardHeight');
     return Container(
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
@@ -153,7 +170,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
           topLeft: Radius.circular(12),
           topRight: Radius.circular(12),
         ),
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
       ),
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -172,7 +189,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
                   autovalidateMode: AutovalidateMode.onUserInteraction,
                   child: TextField(
                     controller: _replyContentController,
-                    minLines: 1,
+                    minLines: 3,
                     maxLines: null,
                     autofocus: false,
                     focusNode: replyContentFocusNode,
@@ -183,6 +200,9 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
                           fontSize: 14,
                         )),
                     style: Theme.of(context).textTheme.bodyLarge,
+                    onChanged: (text) {
+                      message.value = text;
+                    },
                   ),
                 ),
               ),
@@ -225,9 +245,39 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
                   toolbarType: toolbarType,
                   selected: toolbarType == 'emote',
                 ),
+                const SizedBox(width: 6),
+                Obx(
+                  () => showForward.value
+                      ? TextButton.icon(
+                          onPressed: () {
+                            isForward.value = !isForward.value;
+                          },
+                          icon: Icon(
+                              isForward.value
+                                  ? Icons.check_box
+                                  : Icons.check_box_outline_blank,
+                              size: 22),
+                          label: const Text('转发到动态'),
+                          style: ButtonStyle(
+                            foregroundColor: WidgetStateProperty.all(
+                              isForward.value
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).colorScheme.outline,
+                            ),
+                          ),
+                        )
+                      : const SizedBox(),
+                ),
                 const Spacer(),
-                TextButton(
-                    onPressed: () => submitReplyAdd(), child: const Text('发送'))
+                SizedBox(
+                  height: 36,
+                  child: Obx(
+                    () => FilledButton(
+                      onPressed: message.isNotEmpty ? submitReplyAdd : null,
+                      child: const Text('发送'),
+                    ),
+                  ),
+                ),
               ],
             ),
           ),
diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart
index 3fe84c71..6dda9512 100644
--- a/lib/pages/video/detail/reply_reply/view.dart
+++ b/lib/pages/video/detail/reply_reply/view.dart
@@ -78,7 +78,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
   Widget build(BuildContext context) {
     return Container(
       height: widget.source == 'videoDetail' ? widget.sheetHeight : null,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: Column(
         children: [
           if (widget.source == 'videoDetail')
diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
index 0152a2cb..a0f5d6bc 100644
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -23,6 +23,7 @@ import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:status_bar_control/status_bar_control.dart';
 
 import '../../../plugin/pl_player/models/bottom_control_type.dart';
 import '../../../services/shutdown_timer_service.dart';
@@ -38,7 +39,7 @@ class VideoDetailPage extends StatefulWidget {
 }
 
 class _VideoDetailPageState extends State<VideoDetailPage>
-    with TickerProviderStateMixin, RouteAware {
+    with TickerProviderStateMixin, RouteAware, WidgetsBindingObserver {
   late VideoDetailController vdCtr;
   PlPlayerController? plPlayerController;
   final ScrollController _extendNestCtr = ScrollController();
@@ -61,10 +62,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoPiP;
   late Floating floating;
   bool isShowing = true;
+  // 生命周期监听
+  late final AppLifecycleListener _lifecycleListener;
+  late double statusHeight;
 
   @override
   void initState() {
     super.initState();
+    getStatusHeight();
     heroTag = Get.arguments['heroTag'];
     vdCtr = Get.put(VideoDetailController(), tag: heroTag);
     vdCtr.sheetHeight.value = localCache.get('sheetHeight');
@@ -94,8 +99,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     fullScreenStatusListener();
     if (Platform.isAndroid) {
       floating = vdCtr.floating!;
-      autoEnterPip();
     }
+    WidgetsBinding.instance.addObserver(this);
+    lifecycleListener();
   }
 
   // 获取视频资源，初始化播放器
@@ -121,8 +127,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   }
 
   // 播放器状态监听
-  void playerListener(PlayerStatus? status) async {
-    playerStatus.value = status!;
+  void playerListener(PlayerStatus status) async {
+    playerStatus.value = status;
+    autoEnterPip(status: status);
     if (status == PlayerStatus.completed) {
       // 结束播放退出全屏
       if (autoExitFullcreen) {
@@ -169,11 +176,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    await vdCtr.playerInit();
+    await vdCtr.playerInit(autoplay: true);
     plPlayerController = vdCtr.plPlayerController;
     plPlayerController!.addStatusLister(playerListener);
     vdCtr.autoPlay.value = true;
     vdCtr.isShowCover.value = false;
+    autoEnterPip(status: PlayerStatus.playing);
   }
 
   void fullScreenStatusListener() {
@@ -203,6 +211,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     });
   }
 
+  getStatusHeight() async {
+    statusHeight = await StatusBarControl.getHeight;
+  }
+
   @override
   void dispose() {
     shutdownTimerService.handleWaitingFinished();
@@ -219,6 +231,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       floating.dispose();
     }
     appbarStream.close();
+    WidgetsBinding.instance.removeObserver(this);
+    _lifecycleListener.dispose();
     super.dispose();
   }
 
@@ -253,7 +267,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     }
     vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
-    vdCtr.playerInit(autoplay: autoplay);
+    vdCtr.playerInit();
 
     /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
     vdCtr.autoPlay.value = !vdCtr.isShowCover.value;
@@ -274,13 +288,186 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         .subscribe(this, ModalRoute.of(context)! as PageRoute);
   }
 
-  void autoEnterPip() {
+  void autoEnterPip({PlayerStatus? status}) {
     final String routePath = Get.currentRoute;
     if (autoPiP && routePath.startsWith('/video')) {
-      floating.toggleAutoPip(autoEnter: autoPiP);
+      floating.toggleAutoPip(
+        autoEnter: autoPiP && status == PlayerStatus.playing,
+      );
     }
   }
 
+  // 生命周期监听
+  void lifecycleListener() {
+    _lifecycleListener = AppLifecycleListener(
+      // onResume: () => _handleTransition('resume'),
+      // 后台
+      // onInactive: () => _handleTransition('inactive'),
+      // 在Android和iOS端不生效
+      // onHide: () => _handleTransition('hide'),
+      onShow: () => _handleTransition('show'),
+      onPause: () => _handleTransition('pause'),
+      onRestart: () => _handleTransition('restart'),
+      onDetach: () => _handleTransition('detach'),
+    );
+  }
+
+  void _handleTransition(String name) {
+    switch (name) {
+      case 'show' || 'restart':
+        plPlayerController?.danmakuController?.clear();
+        break;
+      case 'pause':
+        vdCtr.hiddenReplyReplyPanel();
+        if (vdCtr.videoType == SearchType.video) {
+          videoIntroController.hiddenEpisodeBottomSheet();
+        }
+        if (vdCtr.videoType == SearchType.media_bangumi) {
+          bangumiIntroController.hiddenEpisodeBottomSheet();
+        }
+        break;
+    }
+  }
+
+  /// 手动播放
+  Widget handlePlayPanel() {
+    return Stack(
+      children: [
+        GestureDetector(
+          onTap: handlePlay,
+          child: Obx(
+            () => NetworkImgLayer(
+              src: vdCtr.cover.value,
+              width: Get.width,
+              height: videoHeight,
+              type: 'emote',
+            ),
+          ),
+        ),
+        buildCustomAppBar(),
+        Positioned(
+          right: 12,
+          bottom: 10,
+          child: GestureDetector(
+            onTap: handlePlay,
+            child: Image.asset(
+              'assets/images/play.png',
+              width: 60,
+              height: 60,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// tabbar
+  Widget tabbarBuild() {
+    return Container(
+      width: double.infinity,
+      height: 45,
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: Theme.of(context).dividerColor.withOpacity(0.1),
+          ),
+        ),
+      ),
+      child: Material(
+        child: Row(
+          children: [
+            Expanded(
+              child: Obx(
+                () => TabBar(
+                  padding: EdgeInsets.zero,
+                  controller: vdCtr.tabCtr,
+                  labelStyle: const TextStyle(fontSize: 13),
+                  labelPadding: const EdgeInsets.symmetric(horizontal: 10.0),
+                  dividerColor: Colors.transparent,
+                  tabs:
+                      vdCtr.tabs.map((String name) => Tab(text: name)).toList(),
+                ),
+              ),
+            ),
+            Flexible(
+              flex: 1,
+              child: Center(
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    Obx(() => AnimatedOpacity(
+                          opacity: playerStatus.value != PlayerStatus.playing
+                              ? 1
+                              : 0,
+                          duration: const Duration(milliseconds: 100),
+                          child: const Icon(
+                            Icons.drag_handle_rounded,
+                            size: 20,
+                            color: Colors.grey,
+                          ),
+                        )),
+                    const SizedBox(width: 8),
+                    SizedBox(
+                      height: 32,
+                      child: TextButton(
+                        style: ButtonStyle(
+                          padding: WidgetStateProperty.all(EdgeInsets.zero),
+                        ),
+                        onPressed: () => vdCtr.showShootDanmakuSheet(),
+                        child:
+                            const Text('发弹幕', style: TextStyle(fontSize: 12)),
+                      ),
+                    ),
+                    SizedBox(
+                      width: 38,
+                      height: 38,
+                      child: Obx(
+                        () => !vdCtr.isShowCover.value
+                            ? IconButton(
+                                onPressed: () {
+                                  plPlayerController?.isOpenDanmu.value =
+                                      !(plPlayerController?.isOpenDanmu.value ??
+                                          false);
+                                },
+                                icon: !(plPlayerController?.isOpenDanmu.value ??
+                                        false)
+                                    ? SvgPicture.asset(
+                                        'assets/images/video/danmu_close.svg',
+                                        // ignore: deprecated_member_use
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .outline,
+                                      )
+                                    : SvgPicture.asset(
+                                        'assets/images/video/danmu_open.svg',
+                                        // ignore: deprecated_member_use
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .primary,
+                                      ),
+                              )
+                            : IconButton(
+                                icon: SvgPicture.asset(
+                                  'assets/images/video/danmu_close.svg',
+                                  // ignore: deprecated_member_use
+                                  color: Theme.of(context).colorScheme.outline,
+                                ),
+                                onPressed: () {},
+                              ),
+                      ),
+                    ),
+                    const SizedBox(width: 18),
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final sizeContext = MediaQuery.sizeOf(context);
@@ -338,172 +525,22 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       },
     );
 
-    /// tabbar
-    Widget tabbarBuild = Container(
-      width: double.infinity,
-      height: 45,
-      decoration: BoxDecoration(
-        border: Border(
-          bottom: BorderSide(
-            width: 1,
-            color: Theme.of(context).dividerColor.withOpacity(0.1),
-          ),
-        ),
-      ),
-      child: Material(
-        child: Row(
-          children: [
-            Flexible(
-              flex: 1,
-              child: Obx(
-                () => TabBar(
-                  padding: EdgeInsets.zero,
-                  controller: vdCtr.tabCtr,
-                  labelStyle: const TextStyle(fontSize: 13),
-                  labelPadding:
-                      const EdgeInsets.symmetric(horizontal: 10.0), // 设置每个标签的宽度
-                  dividerColor: Colors.transparent,
-                  tabs: vdCtr.tabs
-                      .map(
-                        (String name) => Tab(text: name),
-                      )
-                      .toList(),
-                ),
-              ),
-            ),
-            Flexible(
-                flex: 1,
-                child: Center(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    children: [
-                      Obx(() => AnimatedOpacity(
-                            opacity: playerStatus.value != PlayerStatus.playing
-                                ? 1
-                                : 0,
-                            duration: const Duration(milliseconds: 100),
-                            child: const Icon(
-                              Icons.drag_handle_rounded,
-                              size: 20,
-                              color: Colors.grey,
-                            ),
-                          )),
-                      const SizedBox(width: 8),
-                      SizedBox(
-                        height: 32,
-                        child: TextButton(
-                          style: ButtonStyle(
-                            padding: MaterialStateProperty.all(EdgeInsets.zero),
-                          ),
-                          onPressed: () => vdCtr.showShootDanmakuSheet(),
-                          child:
-                              const Text('发弹幕', style: TextStyle(fontSize: 12)),
-                        ),
-                      ),
-                      SizedBox(
-                        width: 38,
-                        height: 38,
-                        child: Obx(
-                          () => !vdCtr.isShowCover.value
-                              ? IconButton(
-                                  onPressed: () {
-                                    plPlayerController?.isOpenDanmu.value =
-                                        !(plPlayerController
-                                                ?.isOpenDanmu.value ??
-                                            false);
-                                  },
-                                  icon:
-                                      !(plPlayerController?.isOpenDanmu.value ??
-                                              false)
-                                          ? SvgPicture.asset(
-                                              'assets/images/video/danmu_close.svg',
-                                              // ignore: deprecated_member_use
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .outline,
-                                            )
-                                          : SvgPicture.asset(
-                                              'assets/images/video/danmu_open.svg',
-                                              // ignore: deprecated_member_use
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .primary,
-                                            ),
-                                )
-                              : IconButton(
-                                  icon: SvgPicture.asset(
-                                    'assets/images/video/danmu_close.svg',
-                                    // ignore: deprecated_member_use
-                                    color:
-                                        Theme.of(context).colorScheme.outline,
-                                  ),
-                                  onPressed: () {},
-                                ),
-                        ),
-                      ),
-                      const SizedBox(width: 18),
-                    ],
-                  ),
-                )),
-          ],
-        ),
-      ),
-    );
-
-    /// 手动播放
-    Widget handlePlayPanel() {
-      return Stack(
-        children: [
-          GestureDetector(
-            onTap: () {
-              handlePlay();
-            },
-            child: NetworkImgLayer(
-              type: 'emote',
-              src: vdCtr.videoItem['pic'],
-              width: Get.width,
-              height: videoHeight.value,
-            ),
-          ),
-          Positioned(
-            top: 0,
-            left: 0,
-            right: 0,
-            child: buildCustomAppBar(),
-          ),
-          Positioned(
-            right: 12,
-            bottom: 10,
-            child: IconButton(
-                tooltip: '播放',
-                onPressed: () => handlePlay(),
-                icon: Image.asset(
-                  'assets/images/play.png',
-                  width: 60,
-                  height: 60,
-                )),
-          ),
-        ],
-      );
-    }
-
     Widget childWhenDisabled = SafeArea(
       top: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
       bottom: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
-      left: false, //plPlayerController?.isFullScreen.value != true,
-      right: false, //plPlayerController?.isFullScreen.value != true,
+      left: false,
+      right: false,
       child: Stack(
         children: [
           Scaffold(
             resizeToAvoidBottomInset: false,
             key: vdCtr.scaffoldKey,
-            backgroundColor: Colors.black,
             appBar: PreferredSize(
               preferredSize: const Size.fromHeight(0),
               child: AppBar(
-                backgroundColor: Colors.transparent,
+                backgroundColor: Colors.black,
                 elevation: 0,
               ),
             ),
@@ -514,73 +551,69 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 return <Widget>[
                   Obx(
                     () {
-                      if (MediaQuery.of(context).orientation ==
-                              Orientation.landscape ||
-                          plPlayerController?.isFullScreen.value == true) {
+                      final Orientation orientation =
+                          MediaQuery.of(context).orientation;
+                      final bool isFullScreen =
+                          plPlayerController?.isFullScreen.value == true;
+                      final double expandedHeight =
+                          orientation == Orientation.landscape || isFullScreen
+                              ? (MediaQuery.sizeOf(context).height -
+                                  (orientation == Orientation.landscape
+                                      ? 0
+                                      : MediaQuery.of(context).padding.top))
+                              : videoHeight.value;
+                      if (orientation == Orientation.landscape ||
+                          isFullScreen) {
                         enterFullScreen();
                       } else {
                         exitFullScreen();
                       }
                       return SliverAppBar(
                         automaticallyImplyLeading: false,
-                        // 假装使用一个非空变量，避免Obx检测不到而罢工
-                        pinned: vdCtr.autoPlay.value,
+                        pinned: true,
                         elevation: 0,
                         scrolledUnderElevation: 0,
                         forceElevated: innerBoxIsScrolled,
-                        expandedHeight: MediaQuery.of(context).orientation ==
-                                    Orientation.landscape ||
-                                plPlayerController?.isFullScreen.value == true
-                            ? (MediaQuery.sizeOf(context).height -
-                                (MediaQuery.of(context).orientation ==
-                                        Orientation.landscape
-                                    ? 0
-                                    : MediaQuery.of(context).padding.top))
-                            : videoHeight.value,
+                        expandedHeight: expandedHeight,
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
-                              canPop: plPlayerController?.isFullScreen.value !=
-                                  true,
-                              onPopInvoked: (bool didPop) {
-                                if (plPlayerController?.isFullScreen.value ==
-                                    true) {
-                                  plPlayerController!
-                                      .triggerFullScreen(status: false);
-                                }
-                                if (MediaQuery.of(context).orientation ==
-                                    Orientation.landscape) {
-                                  verticalScreen();
-                                }
-                              },
-                              child: LayoutBuilder(
-                                builder: (BuildContext context,
-                                    BoxConstraints boxConstraints) {
-                                  // final double maxWidth =
-                                  //     boxConstraints.maxWidth;
-                                  // final double maxHeight =
-                                  //     boxConstraints.maxHeight;
-                                  return Stack(
-                                    children: <Widget>[
-                                      if (isShowing) videoPlayerPanel,
+                            canPop:
+                                plPlayerController?.isFullScreen.value != true,
+                            onPopInvoked: (bool didPop) {
+                              if (plPlayerController?.isFullScreen.value ==
+                                  true) {
+                                plPlayerController!
+                                    .triggerFullScreen(status: false);
+                              }
+                              if (MediaQuery.of(context).orientation ==
+                                  Orientation.landscape) {
+                                verticalScreen();
+                              }
+                            },
+                            child: Hero(
+                              tag: heroTag,
+                              child: Stack(
+                                children: <Widget>[
+                                  if (isShowing) videoPlayerPanel,
 
-                                      /// 关闭自动播放时 手动播放
-                                      Obx(
-                                        () => Visibility(
-                                          visible: !vdCtr.autoPlay.value &&
-                                              vdCtr.isShowCover.value,
-                                          child: Positioned(
-                                            top: 0,
-                                            left: 0,
-                                            right: 0,
-                                            child: handlePlayPanel(),
-                                          ),
-                                        ),
+                                  /// 关闭自动播放时 手动播放
+                                  Obx(
+                                    () => Visibility(
+                                      visible: !vdCtr.autoPlay.value &&
+                                          vdCtr.isShowCover.value,
+                                      child: Positioned(
+                                        top: 0,
+                                        left: 0,
+                                        right: 0,
+                                        child: handlePlayPanel(),
                                       ),
-                                    ],
-                                  );
-                                },
-                              )),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
                         ),
                       );
                     },
@@ -599,55 +632,51 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         : pinnedHeaderHeight;
               },
               onlyOneScrollInBody: true,
-              body: ColoredBox(
-                key: Key(heroTag),
-                color: Theme.of(context).colorScheme.background,
-                child: Column(
-                  children: [
-                    tabbarBuild,
-                    Expanded(
-                      child: TabBarView(
-                        controller: vdCtr.tabCtr,
-                        children: <Widget>[
-                          Builder(
-                            builder: (BuildContext context) {
-                              return CustomScrollView(
-                                key: const PageStorageKey<String>('简介'),
-                                slivers: <Widget>[
-                                  if (vdCtr.videoType == SearchType.video) ...[
-                                    VideoIntroPanel(bvid: vdCtr.bvid),
-                                  ] else if (vdCtr.videoType ==
-                                      SearchType.media_bangumi) ...[
-                                    Obx(() => BangumiIntroPanel(
-                                        cid: vdCtr.cid.value)),
-                                  ],
-                                  SliverToBoxAdapter(
-                                    child: Divider(
-                                      indent: 12,
-                                      endIndent: 12,
-                                      color: Theme.of(context)
-                                          .dividerColor
-                                          .withOpacity(0.06),
-                                    ),
-                                  ),
-                                  if (vdCtr.videoType == SearchType.video &&
-                                      vdCtr.enableRelatedVideo)
-                                    const RelatedVideoPanel(),
+              body: Column(
+                children: [
+                  tabbarBuild(),
+                  Expanded(
+                    child: TabBarView(
+                      controller: vdCtr.tabCtr,
+                      children: <Widget>[
+                        Builder(
+                          builder: (BuildContext context) {
+                            return CustomScrollView(
+                              key: const PageStorageKey<String>('简介'),
+                              slivers: <Widget>[
+                                if (vdCtr.videoType == SearchType.video) ...[
+                                  VideoIntroPanel(bvid: vdCtr.bvid),
+                                ] else if (vdCtr.videoType ==
+                                    SearchType.media_bangumi) ...[
+                                  Obx(() =>
+                                      BangumiIntroPanel(cid: vdCtr.cid.value)),
                                 ],
-                              );
-                            },
+                                SliverToBoxAdapter(
+                                  child: Divider(
+                                    indent: 12,
+                                    endIndent: 12,
+                                    color: Theme.of(context)
+                                        .dividerColor
+                                        .withOpacity(0.06),
+                                  ),
+                                ),
+                                if (vdCtr.videoType == SearchType.video &&
+                                    vdCtr.enableRelatedVideo)
+                                  const RelatedVideoPanel(),
+                              ],
+                            );
+                          },
+                        ),
+                        Obx(
+                          () => VideoReplyPanel(
+                            bvid: vdCtr.bvid,
+                            oid: vdCtr.oid.value,
                           ),
-                          Obx(
-                            () => VideoReplyPanel(
-                              bvid: vdCtr.bvid,
-                              oid: vdCtr.oid.value,
-                            ),
-                          )
-                        ],
-                      ),
+                        )
+                      ],
                     ),
-                  ],
-                ),
+                  ),
+                ],
               ),
             ),
           ),
diff --git a/lib/pages/video/detail/widgets/ai_detail.dart b/lib/pages/video/detail/widgets/ai_detail.dart
index 882a9a8b..37d51106 100644
--- a/lib/pages/video/detail/widgets/ai_detail.dart
+++ b/lib/pages/video/detail/widgets/ai_detail.dart
@@ -23,7 +23,7 @@ class AiDetail extends StatelessWidget {
   Widget build(BuildContext context) {
     sheetHeight = localCache.get('sheetHeight');
     return Container(
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       padding: const EdgeInsets.only(left: 14, right: 14),
       height: sheetHeight,
       child: Column(
@@ -108,7 +108,7 @@ class AiDetail extends StatelessWidget {
                                           fontSize: 13,
                                           color: Theme.of(context)
                                               .colorScheme
-                                              .onBackground,
+                                              .onSurface,
                                           height: 1.5,
                                         ),
                                         children: [
diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/detail/widgets/app_bar.dart
index efc0b593..b16623ad 100644
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@@ -29,7 +29,7 @@ class ScrollAppBar extends StatelessWidget {
         opacity: scrollDistance / (videoHeight - kToolbarHeight),
         child: Container(
           height: statusBarHeight + kToolbarHeight,
-          color: Theme.of(context).colorScheme.background,
+          color: Theme.of(context).colorScheme.surface,
           padding: EdgeInsets.only(top: statusBarHeight),
           child: AppBar(
             primary: false,
diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart
index e00311c5..d839a1eb 100644
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@@ -93,7 +93,7 @@ class _HeaderControlState extends State<HeaderControl> {
           height: 460,
           clipBehavior: Clip.hardEdge,
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: const BorderRadius.all(Radius.circular(12)),
           ),
           margin: const EdgeInsets.all(12),
@@ -180,15 +180,16 @@ class _HeaderControlState extends State<HeaderControl> {
                             '当前音质 ${widget.videoDetailCtr!.currentAudioQa!.description}',
                             style: subTitleStyle),
                       ),
-                    ListTile(
-                      onTap: () => {Get.back(), showSetDecodeFormats()},
-                      dense: true,
-                      leading: const Icon(Icons.av_timer_outlined, size: 20),
-                      title: const Text('解码格式', style: titleStyle),
-                      subtitle: Text(
-                          '当前解码格式 ${widget.videoDetailCtr!.currentDecodeFormats.description}',
-                          style: subTitleStyle),
-                    ),
+                    if (widget.videoDetailCtr!.currentDecodeFormats != null)
+                      ListTile(
+                        onTap: () => {Get.back(), showSetDecodeFormats()},
+                        dense: true,
+                        leading: const Icon(Icons.av_timer_outlined, size: 20),
+                        title: const Text('解码格式', style: titleStyle),
+                        subtitle: Text(
+                            '当前解码格式 ${widget.videoDetailCtr!.currentDecodeFormats!.description}',
+                            style: subTitleStyle),
+                      ),
                     ListTile(
                       onTap: () => {Get.back(), showSetRepeat()},
                       dense: true,
@@ -316,7 +317,7 @@ class _HeaderControlState extends State<HeaderControl> {
             height: 500,
             clipBehavior: Clip.hardEdge,
             decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               borderRadius: const BorderRadius.all(Radius.circular(12)),
             ),
             margin: const EdgeInsets.all(12),
@@ -376,7 +377,7 @@ class _HeaderControlState extends State<HeaderControl> {
                           inactiveThumbColor:
                               Theme.of(context).colorScheme.primaryContainer,
                           inactiveTrackColor:
-                              Theme.of(context).colorScheme.background,
+                              Theme.of(context).colorScheme.surface,
                           splashRadius: 10.0,
                           // boolean variable value
                           value: shutdownTimerService.waitForPlayingCompleted,
@@ -445,7 +446,7 @@ class _HeaderControlState extends State<HeaderControl> {
                       children: [
                         RadioListTile(
                           value: -1,
-                          title: const Text('关闭弹幕'),
+                          title: const Text('关闭字幕'),
                           groupValue: tempThemeValue,
                           onChanged: (value) {
                             tempThemeValue = value!;
@@ -541,16 +542,24 @@ class _HeaderControlState extends State<HeaderControl> {
 
     /// 可用的质量分类
     int userfulQaSam = 0;
-    final List<VideoItem> video = videoInfo.dash!.video!;
-    final Set<int> idSet = {};
-    for (final VideoItem item in video) {
-      final int id = item.id!;
-      if (!idSet.contains(id)) {
-        idSet.add(id);
-        userfulQaSam++;
+    if (videoInfo.dash != null) {
+      // dash格式视频一次请求会返回所有可播放的清晰度video
+      final List<VideoItem> video = videoInfo.dash!.video!;
+      final Set<int> idSet = {};
+      for (final VideoItem item in video) {
+        final int id = item.id!;
+        if (!idSet.contains(id)) {
+          idSet.add(id);
+          userfulQaSam++;
+        }
       }
     }
 
+    if (videoInfo.durl != null) {
+      // durl格式视频一次请求返回对应清晰度video
+      userfulQaSam = videoFormat.length - 1;
+    }
+
     showModalBottomSheet(
       context: context,
       elevation: 0,
@@ -561,7 +570,7 @@ class _HeaderControlState extends State<HeaderControl> {
           height: 310,
           clipBehavior: Clip.hardEdge,
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: const BorderRadius.all(Radius.circular(12)),
           ),
           margin: const EdgeInsets.all(12),
@@ -651,7 +660,7 @@ class _HeaderControlState extends State<HeaderControl> {
           height: 250,
           clipBehavior: Clip.hardEdge,
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: const BorderRadius.all(Radius.circular(12)),
           ),
           margin: const EdgeInsets.all(12),
@@ -707,7 +716,7 @@ class _HeaderControlState extends State<HeaderControl> {
   void showSetDecodeFormats() {
     // 当前选中的解码格式
     final VideoDecodeFormats currentDecodeFormats =
-        widget.videoDetailCtr!.currentDecodeFormats;
+        widget.videoDetailCtr!.currentDecodeFormats!;
     final VideoItem firstVideo = widget.videoDetailCtr!.firstVideo;
     // 当前视频可用的解码格式
     final List<FormatItem> videoFormat = videoInfo.supportFormats!;
@@ -725,7 +734,7 @@ class _HeaderControlState extends State<HeaderControl> {
           height: 250,
           clipBehavior: Clip.hardEdge,
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: const BorderRadius.all(Radius.circular(12)),
           ),
           margin: const EdgeInsets.all(12),
@@ -819,7 +828,7 @@ class _HeaderControlState extends State<HeaderControl> {
             height: 580,
             clipBehavior: Clip.hardEdge,
             decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               borderRadius: const BorderRadius.all(Radius.circular(12)),
             ),
             margin: const EdgeInsets.all(12),
@@ -1075,7 +1084,7 @@ class _HeaderControlState extends State<HeaderControl> {
           height: 250,
           clipBehavior: Clip.hardEdge,
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.background,
+            color: Theme.of(context).colorScheme.surface,
             borderRadius: const BorderRadius.all(Radius.circular(12)),
           ),
           margin: const EdgeInsets.all(12),
@@ -1239,7 +1248,7 @@ class _HeaderControlState extends State<HeaderControl> {
               height: 34,
               child: TextButton(
                 style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
                 ),
                 onPressed: () => showShootDanmakuSheet(),
                 child: const Text(
@@ -1254,7 +1263,7 @@ class _HeaderControlState extends State<HeaderControl> {
               child: Obx(
                 () => IconButton(
                   style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
                   ),
                   onPressed: () {
                     _.isOpenDanmu.value = !_.isOpenDanmu.value;
@@ -1277,7 +1286,7 @@ class _HeaderControlState extends State<HeaderControl> {
               height: 34,
               child: IconButton(
                 style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
                 ),
                 onPressed: () async {
                   bool canUsePiP = false;
@@ -1321,7 +1330,7 @@ class _HeaderControlState extends State<HeaderControl> {
               height: 34,
               child: TextButton(
                 style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
+                  padding: WidgetStateProperty.all(EdgeInsets.zero),
                 ),
                 onPressed: () => showSetSpeedSheet(),
                 child: Text(
diff --git a/lib/pages/webview/controller.dart b/lib/pages/webview/controller.dart
index f26f4284..e0ff113c 100644
--- a/lib/pages/webview/controller.dart
+++ b/lib/pages/webview/controller.dart
@@ -52,15 +52,19 @@ class WebviewController extends GetxController {
             loadProgress.value = progress;
           },
           onPageStarted: (String url) {
-            final String str = Uri.parse(url).pathSegments[0];
-            final Map matchRes = IdUtils.matchAvorBv(input: str);
-            final List matchKeys = matchRes.keys.toList();
-            if (matchKeys.isNotEmpty) {
-              if (matchKeys.first == 'BV') {
-                Get.offAndToNamed(
-                  '/searchResult',
-                  parameters: {'keyword': matchRes['BV']},
-                );
+            final List pathSegments = Uri.parse(url).pathSegments;
+            if (pathSegments.isNotEmpty &&
+                url != 'https://passport.bilibili.com/h5-app/passport/login') {
+              final String str = pathSegments[0];
+              final Map matchRes = IdUtils.matchAvorBv(input: str);
+              final List matchKeys = matchRes.keys.toList();
+              if (matchKeys.isNotEmpty) {
+                if (matchKeys.first == 'BV') {
+                  Get.offAndToNamed(
+                    '/searchResult',
+                    parameters: {'keyword': matchRes['BV']},
+                  );
+                }
               }
             }
           },
@@ -72,7 +76,7 @@ class WebviewController extends GetxController {
                 (url.startsWith(
                         'https://passport.bilibili.com/web/sso/exchange_cookie') ||
                     url.startsWith('https://m.bilibili.com/'))) {
-              confirmLogin(url);
+              LoginUtils.confirmLogin(url, controller);
             }
           },
           onWebResourceError: (WebResourceError error) {},
@@ -93,51 +97,4 @@ class WebviewController extends GetxController {
       )
       ..loadRequest(Uri.parse(url));
   }
-
-  confirmLogin(url) async {
-    var content = '';
-    if (url != null) {
-      content = '${content + url}; \n';
-    }
-    try {
-      await SetCookie.onSet();
-      final result = await UserHttp.userInfo();
-      if (result['status'] && result['data'].isLogin) {
-        SmartDialog.showToast('登录成功');
-        try {
-          Box userInfoCache = GStrorage.userInfo;
-          await userInfoCache.put('userInfoCache', result['data']);
-
-          final HomeController homeCtr = Get.find<HomeController>();
-          homeCtr.updateLoginStatus(true);
-          homeCtr.userFace.value = result['data'].face;
-          final MediaController mediaCtr = Get.find<MediaController>();
-          mediaCtr.mid = result['data'].mid;
-          await LoginUtils.refreshLoginStatus(true);
-        } catch (err) {
-          SmartDialog.show(builder: (BuildContext context) {
-            return AlertDialog(
-              title: const Text('登录遇到问题'),
-              content: Text(err.toString()),
-              actions: [
-                TextButton(
-                  onPressed: () => controller.reload(),
-                  child: const Text('确认'),
-                )
-              ],
-            );
-          });
-        }
-        Get.back();
-      } else {
-        // 获取用户信息失败
-        SmartDialog.showToast(result['msg']);
-        Clipboard.setData(ClipboardData(text: result['msg']));
-      }
-    } catch (e) {
-      SmartDialog.showNotify(msg: e.toString(), notifyType: NotifyType.warning);
-      content = content + e.toString();
-      Clipboard.setData(ClipboardData(text: content));
-    }
-  }
 }
diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart
index 8edd2189..cba40ad1 100644
--- a/lib/pages/webview/view.dart
+++ b/lib/pages/webview/view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/utils/login.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'controller.dart';
 import 'package:webview_flutter/webview_flutter.dart';
@@ -43,7 +44,8 @@ class _WebviewPageState extends State<WebviewPage> {
             Obx(
               () => _webviewController.type.value == 'login'
                   ? TextButton(
-                      onPressed: () => _webviewController.confirmLogin(null),
+                      onPressed: () =>
+                          LoginUtils.confirmLogin(null, _webviewController),
                       child: const Text('刷新登录状态'),
                     )
                   : const SizedBox(),
diff --git a/lib/pages/whisper/view.dart b/lib/pages/whisper/view.dart
index fa7ad60b..fa95463b 100644
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -1,6 +1,7 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/skeleton/skeleton.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -102,134 +103,83 @@ class _WhisperPageState extends State<WhisperPage> {
               },
               child: SingleChildScrollView(
                 controller: _scrollController,
-                child: Column(
-                  children: [
-                    FutureBuilder(
-                      future: _futureBuilderFuture,
-                      builder: (context, snapshot) {
-                        if (snapshot.connectionState == ConnectionState.done) {
-                          Map? data = snapshot.data;
-                          if (data != null && data['status']) {
-                            RxList sessionList = _whisperController.sessionList;
-                            return Obx(
-                              () => sessionList.isEmpty
-                                  ? const SizedBox()
-                                  : ListView.separated(
-                                      itemCount: sessionList.length,
-                                      shrinkWrap: true,
-                                      physics:
-                                          const NeverScrollableScrollPhysics(),
-                                      itemBuilder: (_, int i) {
-                                        return ListTile(
-                                          onTap: () {
-                                            sessionList[i].unreadCount = 0;
-                                            sessionList.refresh();
-                                            Get.toNamed(
-                                              '/whisperDetail',
-                                              parameters: {
-                                                'talkerId': sessionList[i]
-                                                    .talkerId
-                                                    .toString(),
-                                                'name': sessionList[i]
-                                                    .accountInfo
-                                                    .name,
-                                                'face': sessionList[i]
-                                                    .accountInfo
-                                                    .face,
-                                                'mid': sessionList[i]
-                                                    .accountInfo
-                                                    .mid
-                                                    .toString(),
-                                              },
-                                            );
-                                          },
-                                          leading: Badge(
-                                            isLabelVisible:
-                                                sessionList[i].unreadCount > 0,
-                                            label: Text(sessionList[i]
-                                                .unreadCount
-                                                .toString()),
-                                            alignment: Alignment.topRight,
-                                            child: NetworkImgLayer(
-                                              width: 45,
-                                              height: 45,
-                                              type: 'avatar',
-                                              src: sessionList[i]
-                                                  .accountInfo
-                                                  .face,
-                                            ),
-                                          ),
-                                          title: Text(
-                                              sessionList[i].accountInfo.name),
-                                          subtitle: Text(
-                                              sessionList[i].lastMsg.content !=
-                                                          null &&
-                                                      sessionList[i]
-                                                              .lastMsg
-                                                              .content !=
-                                                          ''
-                                                  ? (sessionList[i]
-                                                          .lastMsg
-                                                          .content['text'] ??
-                                                      sessionList[i]
-                                                          .lastMsg
-                                                          .content['content'] ??
-                                                      sessionList[i]
-                                                          .lastMsg
-                                                          .content['title'] ??
-                                                      sessionList[i]
-                                                              .lastMsg
-                                                              .content[
-                                                          'reply_content'] ??
-                                                      '不支持的消息类型')
-                                                  : '不支持的消息类型',
-                                              maxLines: 1,
-                                              overflow: TextOverflow.ellipsis,
-                                              style: Theme.of(context)
-                                                  .textTheme
-                                                  .labelMedium!
-                                                  .copyWith(
-                                                      color: Theme.of(context)
-                                                          .colorScheme
-                                                          .outline)),
-                                          trailing: Text(
-                                            Utils.dateFormat(sessionList[i]
-                                                .lastMsg
-                                                .timestamp),
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .labelSmall!
-                                                .copyWith(
-                                                    color: Theme.of(context)
-                                                        .colorScheme
-                                                        .outline),
-                                          ),
-                                        );
-                                      },
-                                      separatorBuilder:
-                                          (BuildContext context, int index) {
-                                        return Divider(
-                                          indent: 72,
-                                          endIndent: 20,
-                                          height: 6,
-                                          color: Colors.grey.withOpacity(0.1),
-                                        );
-                                      },
-                                    ),
-                            );
-                          } else {
-                            // 请求错误
-                            return Center(
-                              child: Text(data?['msg'] ?? '请求异常'),
-                            );
-                          }
-                        } else {
-                          // 骨架屏
-                          return const SizedBox();
-                        }
-                      },
-                    )
-                  ],
+                child: FutureBuilder(
+                  future: _futureBuilderFuture,
+                  builder: (context, snapshot) {
+                    if (snapshot.connectionState == ConnectionState.done) {
+                      Map? data = snapshot.data;
+                      if (data != null && data['status']) {
+                        RxList sessionList = _whisperController.sessionList;
+                        return Obx(
+                          () => sessionList.isEmpty
+                              ? const SizedBox()
+                              : ListView.separated(
+                                  itemCount: sessionList.length,
+                                  shrinkWrap: true,
+                                  physics: const NeverScrollableScrollPhysics(),
+                                  itemBuilder: (_, int i) {
+                                    return SessionItem(
+                                      sessionItem: sessionList[i],
+                                      changeFucCall: () =>
+                                          sessionList.refresh(),
+                                    );
+                                  },
+                                  separatorBuilder:
+                                      (BuildContext context, int index) {
+                                    return Divider(
+                                      indent: 72,
+                                      endIndent: 20,
+                                      height: 6,
+                                      color: Colors.grey.withOpacity(0.1),
+                                    );
+                                  },
+                                ),
+                        );
+                      } else {
+                        // 请求错误
+                        return Center(
+                          child: Text(data?['msg'] ?? '请求异常'),
+                        );
+                      }
+                    } else {
+                      // 骨架屏
+                      return ListView.builder(
+                        itemCount: 15,
+                        shrinkWrap: true,
+                        physics: const NeverScrollableScrollPhysics(),
+                        itemBuilder: (context, int i) {
+                          return Skeleton(
+                            child: ListTile(
+                              leading: Container(
+                                width: 45,
+                                height: 45,
+                                decoration: BoxDecoration(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .onInverseSurface,
+                                  borderRadius: BorderRadius.circular(25),
+                                ),
+                              ),
+                              title: Container(
+                                width: 100,
+                                height: 14,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onInverseSurface,
+                              ),
+                              subtitle: Container(
+                                width: 80,
+                                height: 14,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .onInverseSurface,
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    }
+                  },
                 ),
               ),
             ),
@@ -239,3 +189,67 @@ class _WhisperPageState extends State<WhisperPage> {
     );
   }
 }
+
+class SessionItem extends StatelessWidget {
+  final dynamic sessionItem;
+  final Function changeFucCall;
+
+  const SessionItem({
+    super.key,
+    required this.sessionItem,
+    required this.changeFucCall,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final content = sessionItem.lastMsg.content;
+    return ListTile(
+      onTap: () {
+        sessionItem.unreadCount = 0;
+        changeFucCall.call();
+        Get.toNamed(
+          '/whisperDetail',
+          parameters: {
+            'talkerId': sessionItem.talkerId.toString(),
+            'name': sessionItem.accountInfo.name,
+            'face': sessionItem.accountInfo.face,
+            'mid': sessionItem.accountInfo.mid.toString(),
+          },
+        );
+      },
+      leading: Badge(
+        isLabelVisible: sessionItem.unreadCount > 0,
+        label: Text(sessionItem.unreadCount.toString()),
+        alignment: Alignment.topRight,
+        child: NetworkImgLayer(
+          width: 45,
+          height: 45,
+          type: 'avatar',
+          src: sessionItem.accountInfo.face,
+        ),
+      ),
+      title: Text(sessionItem.accountInfo.name),
+      subtitle: Text(
+          content != null && content != ''
+              ? (content['text'] ??
+                  content['content'] ??
+                  content['title'] ??
+                  content['reply_content'] ??
+                  '不支持的消息类型')
+              : '不支持的消息类型',
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context)
+              .textTheme
+              .labelMedium!
+              .copyWith(color: Theme.of(context).colorScheme.outline)),
+      trailing: Text(
+        Utils.dateFormat(sessionItem.lastMsg.timestamp),
+        style: Theme.of(context)
+            .textTheme
+            .labelSmall!
+            .copyWith(color: Theme.of(context).colorScheme.outline),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/whisper_detail/view.dart b/lib/pages/whisper_detail/view.dart
index 1701be33..042afca1 100644
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@@ -95,9 +95,9 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
                 height: 34,
                 child: IconButton(
                   style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                    backgroundColor: MaterialStateProperty.resolveWith(
-                        (Set<MaterialState> states) {
+                    padding: WidgetStateProperty.all(EdgeInsets.zero),
+                    backgroundColor: WidgetStateProperty.resolveWith(
+                        (Set<WidgetState> states) {
                       return Theme.of(context)
                           .colorScheme
                           .primaryContainer
diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart
index 4fd49254..0d37e8b3 100644
--- a/lib/pages/whisper_detail/widget/chat_item.dart
+++ b/lib/pages/whisper_detail/widget/chat_item.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/utils/route_push.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/storage.dart';
 
@@ -154,16 +155,33 @@ class ChatItem extends StatelessWidget {
               GestureDetector(
                 onTap: () async {
                   SmartDialog.showLoading();
-                  var bvid = content["bvid"];
+                  final String bvid = content["bvid"];
+                  // 16番剧 5投稿
+                  final int source = content["source"];
+                  final String? url = content["url"];
+
                   final int cid = await SearchHttp.ab2c(bvid: bvid);
                   final String heroTag = Utils.makeHeroTag(bvid);
-                  SmartDialog.dismiss<dynamic>().then(
-                    (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
-                        arguments: <String, String?>{
-                          'pic': content['thumb'],
-                          'heroTag': heroTag,
-                        }),
-                  );
+                  await SmartDialog.dismiss();
+                  if (source == 5) {
+                    Get.toNamed<dynamic>(
+                      '/video?bvid=$bvid&cid=$cid',
+                      arguments: <String, String?>{
+                        'pic': content['thumb'],
+                        'heroTag': heroTag,
+                      },
+                    );
+                  }
+                  if (source == 16) {
+                    if (url != null) {
+                      final String area = url.split('/').last;
+                      if (area.startsWith('ep')) {
+                        RoutePush.bangumiPush(null, Utils.matchNum(area).first);
+                      } else if (area.startsWith('ss')) {
+                        RoutePush.bangumiPush(Utils.matchNum(area).first, null);
+                      }
+                    }
+                  }
                 },
                 child: NetworkImgLayer(
                   width: 220,
@@ -183,7 +201,7 @@ class ChatItem extends StatelessWidget {
               ),
               const SizedBox(height: 1),
               Text(
-                content['author'],
+                content['author'] ?? '',
                 style: TextStyle(
                   letterSpacing: 0.6,
                   height: 1.5,
@@ -206,7 +224,7 @@ class ChatItem extends StatelessWidget {
                   SmartDialog.dismiss<dynamic>().then(
                     (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
                         arguments: <String, String?>{
-                          'pic': content['thumb'],
+                          'pic': content['thumb'] ?? '',
                           'heroTag': heroTag,
                         }),
                   );
@@ -241,115 +259,114 @@ class ChatItem extends StatelessWidget {
           );
         case MsgType.auto_reply_push:
           return Container(
-              constraints: const BoxConstraints(
-                maxWidth: 300.0, // 设置最大宽度为200.0
+            constraints: const BoxConstraints(
+              maxWidth: 300.0, // 设置最大宽度为200.0
+            ),
+            decoration: BoxDecoration(
+              color: Theme.of(context)
+                  .colorScheme
+                  .secondaryContainer
+                  .withOpacity(0.4),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(16),
               ),
-              decoration: BoxDecoration(
-                color: Theme.of(context)
-                    .colorScheme
-                    .secondaryContainer
-                    .withOpacity(0.4),
-                borderRadius: const BorderRadius.only(
-                  topLeft: Radius.circular(16),
-                  topRight: Radius.circular(16),
-                  bottomLeft: Radius.circular(6),
-                  bottomRight: Radius.circular(16),
-                ),
-              ),
-              margin: const EdgeInsets.all(12),
-              padding: const EdgeInsets.all(12),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    content['main_title'],
-                    style: TextStyle(
-                      letterSpacing: 0.6,
-                      height: 1.5,
-                      color: textColor(context),
-                      fontWeight: FontWeight.bold,
-                    ),
+            ),
+            margin: const EdgeInsets.all(12),
+            padding: const EdgeInsets.all(12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  content['main_title'],
+                  style: TextStyle(
+                    letterSpacing: 0.6,
+                    height: 1.5,
+                    color: textColor(context),
+                    fontWeight: FontWeight.bold,
                   ),
-                  for (var i in content['sub_cards']) ...<Widget>[
-                    const SizedBox(height: 6),
-                    GestureDetector(
-                        onTap: () async {
-                          RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}',
-                              caseSensitive: false);
-                          Iterable<Match> matches =
-                              bvRegex.allMatches(i['jump_url']);
-                          if (matches.isNotEmpty) {
-                            Match match = matches.first;
-                            String bvid = match.group(0)!;
-                            try {
-                              SmartDialog.showLoading();
-                              final int cid = await SearchHttp.ab2c(bvid: bvid);
-                              final String heroTag = Utils.makeHeroTag(bvid);
-                              SmartDialog.dismiss<dynamic>().then(
-                                (e) => Get.toNamed<dynamic>(
-                                    '/video?bvid=$bvid&cid=$cid',
-                                    arguments: <String, String?>{
-                                      'pic': i['cover_url'],
-                                      'heroTag': heroTag,
-                                    }),
-                              );
-                            } catch (err) {
-                              SmartDialog.dismiss();
-                              SmartDialog.showToast(err.toString());
-                            }
-                          } else {
-                            SmartDialog.showToast('未匹配到 BV 号');
-                            Get.toNamed('/webview',
-                                arguments: {'url': i['jump_url']});
-                          }
-                        },
-                        child: Row(
+                ),
+                for (var i in content['sub_cards']) ...<Widget>[
+                  const SizedBox(height: 6),
+                  GestureDetector(
+                    onTap: () async {
+                      RegExp bvRegex =
+                          RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false);
+                      Iterable<Match> matches =
+                          bvRegex.allMatches(i['jump_url']);
+                      if (matches.isNotEmpty) {
+                        Match match = matches.first;
+                        String bvid = match.group(0)!;
+                        try {
+                          SmartDialog.showLoading();
+                          final int cid = await SearchHttp.ab2c(bvid: bvid);
+                          final String heroTag = Utils.makeHeroTag(bvid);
+                          SmartDialog.dismiss<dynamic>().then(
+                            (e) => Get.toNamed<dynamic>(
+                                '/video?bvid=$bvid&cid=$cid',
+                                arguments: <String, String?>{
+                                  'pic': i['cover_url'],
+                                  'heroTag': heroTag,
+                                }),
+                          );
+                        } catch (err) {
+                          SmartDialog.dismiss();
+                          SmartDialog.showToast(err.toString());
+                        }
+                      } else {
+                        SmartDialog.showToast('未匹配到 BV 号');
+                        Get.toNamed('/webview',
+                            arguments: {'url': i['jump_url']});
+                      }
+                    },
+                    child: Row(
+                      children: [
+                        NetworkImgLayer(
+                          width: 130,
+                          height: 130 * 9 / 16,
+                          src: i['cover_url'],
+                        ),
+                        const SizedBox(width: 6),
+                        Expanded(
+                            child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            NetworkImgLayer(
-                              width: 130,
-                              height: 130 * 9 / 16,
-                              src: i['cover_url'],
+                            Text(
+                              i['field1'],
+                              maxLines: 2,
+                              style: TextStyle(
+                                letterSpacing: 0.6,
+                                height: 1.5,
+                                color: textColor(context),
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                            Text(
+                              i['field2'],
+                              style: TextStyle(
+                                letterSpacing: 0.6,
+                                height: 1.5,
+                                color: textColor(context).withOpacity(0.6),
+                                fontSize: 12,
+                              ),
+                            ),
+                            Text(
+                              i['field3'],
+                              style: TextStyle(
+                                letterSpacing: 0.6,
+                                height: 1.5,
+                                color: textColor(context).withOpacity(0.6),
+                                fontSize: 12,
+                              ),
                             ),
-                            const SizedBox(width: 6),
-                            Expanded(
-                                child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  i['field1'],
-                                  maxLines: 2,
-                                  style: TextStyle(
-                                    letterSpacing: 0.6,
-                                    height: 1.5,
-                                    color: textColor(context),
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                                Text(
-                                  i['field2'],
-                                  style: TextStyle(
-                                    letterSpacing: 0.6,
-                                    height: 1.5,
-                                    color: textColor(context).withOpacity(0.6),
-                                    fontSize: 12,
-                                  ),
-                                ),
-                                Text(
-                                  Utils.timeFormat(int.parse(i['field3'])),
-                                  style: TextStyle(
-                                    letterSpacing: 0.6,
-                                    height: 1.5,
-                                    color: textColor(context).withOpacity(0.6),
-                                    fontSize: 12,
-                                  ),
-                                ),
-                              ],
-                            )),
                           ],
                         )),
-                  ],
+                      ],
+                    ),
+                  ),
                 ],
-              ));
+              ],
+            ),
+          );
         default:
           return Text(
             content != null && content != ''
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index be72eccb..03c2efbe 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -101,7 +101,7 @@ class PlPlayerController {
   bool _isFirstTime = true;
 
   Timer? _timer;
-  late Timer? _timerForSeek;
+  Timer? _timerForSeek;
   Timer? _timerForVolume;
   Timer? _timerForShowingVolume;
   Timer? _timerForGettingVolume;
@@ -123,6 +123,7 @@ class PlPlayerController {
   PreferredSizeWidget? bottomControl;
   Widget? danmuWidget;
   late RxList subtitles;
+  String videoType = 'archive';
 
   /// 数据加载监听
   Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
@@ -220,7 +221,7 @@ class PlPlayerController {
   Rx<int> get playerCount => _playerCount;
 
   ///
-  Rx<String> get videoType => _videoType;
+  // Rx<String> get videoType => _videoType;
 
   /// 弹幕开关
   Rx<bool> isOpenDanmu = false.obs;
@@ -274,8 +275,7 @@ class PlPlayerController {
   }
 
   // 添加一个私有构造函数
-  PlPlayerController._() {
-    _videoType = videoType;
+  PlPlayerController._internal(this.videoType) {
     isOpenDanmu.value =
         setting.get(SettingBoxKey.enableShowDanmaku, defaultValue: false);
     blockTypes =
@@ -330,13 +330,15 @@ class PlPlayerController {
   }
 
   // 获取实例 传参
-  static PlPlayerController getInstance({
+  factory PlPlayerController({
     String videoType = 'archive',
   }) {
     // 如果实例尚未创建，则创建一个新实例
-    _instance ??= PlPlayerController._();
-    _instance!._playerCount.value += 1;
-    _videoType.value = videoType;
+    _instance ??= PlPlayerController._internal(videoType);
+    if (videoType != 'none') {
+      _instance!._playerCount.value += 1;
+      _videoType.value = videoType;
+    }
     return _instance!;
   }
 
@@ -351,7 +353,7 @@ class PlPlayerController {
     // 初始化播放速度
     double speed = 1.0,
     // 硬件加速
-    bool enableHA = true,
+    bool enableHA = false,
     double? width,
     double? height,
     Duration? duration,
@@ -393,7 +395,7 @@ class PlPlayerController {
       }
       // 配置Player 音轨、字幕等等
       _videoPlayerController = await _createVideoController(
-          dataSource, _looping, enableHA, width, height);
+          dataSource, _looping, enableHA, width, height, seekTo);
       // 获取视频时长 00:00
       _duration.value = duration ?? _videoPlayerController!.state.duration;
       updateDurationSecond();
@@ -404,7 +406,7 @@ class PlPlayerController {
       if (!_listenersInitialized) {
         startListeners();
       }
-      await _initializePlayer(seekTo: seekTo, duration: _duration.value);
+      await _initializePlayer(duration: _duration.value);
       bool autoEnterFullcreen =
           setting.get(SettingBoxKey.enableAutoEnter, defaultValue: false);
       if (autoEnterFullcreen && _isFirstTime) {
@@ -424,6 +426,7 @@ class PlPlayerController {
     bool enableHA,
     double? width,
     double? height,
+    Duration seekTo,
   ) async {
     // 每次配置时先移除监听
     removeListeners();
@@ -440,7 +443,7 @@ class PlPlayerController {
           configuration: PlayerConfiguration(
             // 默认缓存 5M 大小
             bufferSize:
-                videoType.value == 'live' ? 32 * 1024 * 1024 : 5 * 1024 * 1024,
+                videoType == 'live' ? 32 * 1024 * 1024 : 5 * 1024 * 1024,
           ),
         );
 
@@ -505,8 +508,9 @@ class PlPlayerController {
         play: false,
       );
     }
-    player.open(
-      Media(dataSource.videoSource!, httpHeaders: dataSource.httpHeaders),
+    await player.open(
+      Media(dataSource.videoSource!,
+          httpHeaders: dataSource.httpHeaders, start: seekTo),
       play: false,
     );
     // 音轨
@@ -519,7 +523,6 @@ class PlPlayerController {
 
   // 开始播放
   Future _initializePlayer({
-    Duration seekTo = Duration.zero,
     Duration? duration,
   }) async {
     getVideoFit();
@@ -528,9 +531,9 @@ class PlPlayerController {
     // }
 
     /// 跳转播放
-    if (seekTo != Duration.zero) {
-      await this.seekTo(seekTo);
-    }
+    // if (seekTo != Duration.zero) {
+    //   await this.seekTo(seekTo);
+    // }
 
     /// 自动播放
     if (_autoPlay) {
@@ -538,7 +541,7 @@ class PlPlayerController {
     }
 
     /// 设置倍速
-    if (videoType.value == 'live') {
+    if (videoType == 'live') {
       await setPlaybackSpeed(1.0);
     } else {
       if (_playbackSpeed.value != 1.0) {
@@ -930,7 +933,7 @@ class PlPlayerController {
 
   /// 设置长按倍速状态 live模式下禁用
   void setDoubleSpeedStatus(bool val) {
-    if (videoType.value == 'live') {
+    if (videoType == 'live') {
       return;
     }
     if (controlsLock.value) {
@@ -974,41 +977,8 @@ class PlPlayerController {
       } else {
         await landScape();
       }
-
-      // bool isValid =
-      //     direction.value == 'vertical' || mode == FullScreenMode.vertical
-      //         ? true
-      //         : false;
-      // var result = await showDialog(
-      //   context: Get.context!,
-      //   useSafeArea: false,
-      //   builder: (context) => Dialog.fullscreen(
-      //     backgroundColor: Colors.black,
-      //     child: SafeArea(
-      //       // 忽略手机安全区域
-      //       top: isValid,
-      //       left: false,
-      //       right: false,
-      //       bottom: isValid,
-      //       child: PLVideoPlayer(
-      //         controller: this,
-      //         headerControl: headerControl,
-      //         bottomControl: bottomControl,
-      //         danmuWidget: danmuWidget,
-      //       ),
-      //     ),
-      //   ),
-      // );
-      // if (result == null) {
-      //   // 退出全屏
-      //   StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
-      //   exitFullScreen();
-      //   await verticalScreen();
-      //   toggleFullScreen(false);
-      // }
-    } else if (isFullScreen.value) {
+    } else if (isFullScreen.value && !status) {
       StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
-      // Get.back();
       exitFullScreen();
       await verticalScreen();
       toggleFullScreen(false);
@@ -1045,7 +1015,7 @@ class PlPlayerController {
     if (!_enableHeart) {
       return false;
     }
-    if (videoType.value == 'live') {
+    if (videoType == 'live') {
       return;
     }
     // 播放状态变化时，更新
@@ -1120,9 +1090,6 @@ class PlPlayerController {
   }
 
   Future<void> dispose({String type = 'single'}) async {
-    print('dispose');
-    print('dispose: ${playerCount.value}');
-
     // 每次减1，最后销毁
     if (type == 'single' && playerCount.value > 1) {
       _playerCount.value -= 1;
@@ -1132,7 +1099,6 @@ class PlPlayerController {
     }
     _playerCount.value = 0;
     try {
-      print('dispose dispose ---------');
       _timer?.cancel();
       _timerForVolume?.cancel();
       _timerForGettingVolume?.cancel();
@@ -1148,7 +1114,6 @@ class PlPlayerController {
       // _buffered.close();
       // _showControls.close();
       // _controlsLock.close();
-
       // playerStatus.status.close();
       // dataStatus.status.close();
 
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index 6a5f22ec..0e405884 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -7,6 +7,7 @@ import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:lottie/lottie.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:pilipala/models/common/gesture_mode.dart';
@@ -278,7 +279,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             widget.showEposideCb?.call();
           },
           style: ButtonStyle(
-            padding: MaterialStateProperty.all(EdgeInsets.zero),
+            padding: WidgetStateProperty.all(EdgeInsets.zero),
           ),
           child: const Text(
             '选集',
@@ -293,7 +294,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         child: TextButton(
           onPressed: () => _.toggleVideoFit(),
           style: ButtonStyle(
-            padding: MaterialStateProperty.all(EdgeInsets.zero),
+            padding: WidgetStateProperty.all(EdgeInsets.zero),
           ),
           child: Obx(
             () => Text(
@@ -310,7 +311,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         height: 34,
         child: TextButton(
           style: ButtonStyle(
-            padding: MaterialStateProperty.all(EdgeInsets.zero),
+            padding: WidgetStateProperty.all(EdgeInsets.zero),
           ),
           onPressed: () {},
           child: Obx(
@@ -334,7 +335,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             color: Colors.white,
           ),
         ),
-        fuc: () => _.triggerFullScreen(),
+        fuc: () => _.triggerFullScreen(status: !_.isFullScreen.value),
       ),
     };
     final List<Widget> list = [];
@@ -652,7 +653,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             },
             onDoubleTapDown: (TapDownDetails details) {
               // live模式下禁用 锁定时🔒禁用
-              if (_.videoType.value == 'live' || _.controlsLock.value) {
+              if (_.videoType == 'live' || _.controlsLock.value) {
                 return;
               }
               final double totalWidth = MediaQuery.sizeOf(context).width;
@@ -679,7 +680,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
             /// 水平位置 快进 live模式下禁用
             onHorizontalDragUpdate: (DragUpdateDetails details) {
               // live模式下禁用 锁定时🔒禁用
-              if (_.videoType.value == 'live' || _.controlsLock.value) {
+              if (_.videoType == 'live' || _.controlsLock.value) {
                 return;
               }
               // final double tapPosition = details.localPosition.dx;
@@ -695,7 +696,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               _.onChangedSliderStart();
             },
             onHorizontalDragEnd: (DragEndDetails details) {
-              if (_.videoType.value == 'live' || _.controlsLock.value) {
+              if (_.videoType == 'live' || _.controlsLock.value) {
                 return;
               }
               _.onChangedSliderEnd();
@@ -733,14 +734,18 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 const double threshold = 7.0; // 滑动阈值
                 final bool flag =
                     fullScreenGestureMode != FullScreenGestureMode.values.last;
-                if (dy > _distance.value && dy > threshold) {
+                if (dy > _distance.value &&
+                    dy > threshold &&
+                    !_.controlsLock.value) {
                   if (_.isFullScreen.value ^ flag) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 下滑退出全屏
                     await widget.controller.triggerFullScreen(status: flag);
                   }
                   _distance.value = 0.0;
-                } else if (dy < _distance.value && dy < -threshold) {
+                } else if (dy < _distance.value &&
+                    dy < -threshold &&
+                    !_.controlsLock.value) {
                   if (!_.isFullScreen.value ^ flag) {
                     lastFullScreenToggleTime = DateTime.now();
                     // 上滑进入全屏
@@ -768,37 +773,33 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         ),
 
         // 头部、底部控制条
-        SafeArea(
-          top: false,
-          bottom: false,
-          child: Obx(
-            () => Column(
-              children: [
-                if (widget.headerControl != null || _.headerControl != null)
-                  ClipRect(
-                    child: AppBarAni(
-                      controller: animationController,
-                      visible: !_.controlsLock.value && _.showControls.value,
-                      position: 'top',
-                      child: widget.headerControl ?? _.headerControl!,
-                    ),
-                  ),
-                const Spacer(),
+        Obx(
+          () => Column(
+            children: [
+              if (widget.headerControl != null || _.headerControl != null)
                 ClipRect(
                   child: AppBarAni(
                     controller: animationController,
                     visible: !_.controlsLock.value && _.showControls.value,
-                    position: 'bottom',
-                    child: widget.bottomControl ??
-                        BottomControl(
-                          controller: widget.controller,
-                          triggerFullScreen: _.triggerFullScreen,
-                          buildBottomControl: buildBottomControl(),
-                        ),
+                    position: 'top',
+                    child: widget.headerControl ?? _.headerControl!,
                   ),
                 ),
-              ],
-            ),
+              const Spacer(),
+              ClipRect(
+                child: AppBarAni(
+                  controller: animationController,
+                  visible: !_.controlsLock.value && _.showControls.value,
+                  position: 'bottom',
+                  child: widget.bottomControl ??
+                      BottomControl(
+                        controller: widget.controller,
+                        triggerFullScreen: _.triggerFullScreen,
+                        buildBottomControl: buildBottomControl(),
+                      ),
+                ),
+              ),
+            ],
           ),
         ),
 
@@ -826,7 +827,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               return const SizedBox();
             }
 
-            if (_.videoType.value == 'live') {
+            if (_.videoType == 'live') {
               return const SizedBox();
             }
             if (value > max || max <= 0) {
@@ -879,7 +880,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         // 锁
         Obx(
           () => Visibility(
-            visible: _.videoType.value != 'live' && _.isFullScreen.value,
+            visible: _.videoType != 'live' && _.isFullScreen.value,
             child: Align(
               alignment: Alignment.centerLeft,
               child: FractionalTranslation(
@@ -913,9 +914,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     colors: [Colors.black26, Colors.transparent],
                   ),
                 ),
-                child: Image.asset(
-                  'assets/images/loading.gif',
-                  height: 25,
+                child: Lottie.asset(
+                  'assets/loading.json',
+                  width: 200,
                 ),
               ),
             );
@@ -939,7 +940,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               begin: 0.0,
                               end: _hideSeekBackwardButton.value ? 0.0 : 1.0,
                             ),
-                            duration: const Duration(milliseconds: 500),
+                            duration: const Duration(milliseconds: 200),
                             builder: (BuildContext context, double value,
                                     Widget? child) =>
                                 Opacity(
@@ -982,7 +983,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                               begin: 0.0,
                               end: _hideSeekForwardButton.value ? 0.0 : 1.0,
                             ),
-                            duration: const Duration(milliseconds: 500),
+                            duration: const Duration(milliseconds: 200),
                             builder: (BuildContext context, double value,
                                     Widget? child) =>
                                 Opacity(
diff --git a/lib/plugin/pl_player/widgets/app_bar_ani.dart b/lib/plugin/pl_player/widgets/app_bar_ani.dart
index 53eaad16..a1db5807 100644
--- a/lib/plugin/pl_player/widgets/app_bar_ani.dart
+++ b/lib/plugin/pl_player/widgets/app_bar_ani.dart
@@ -29,6 +29,10 @@ class AppBarAni extends StatelessWidget implements PreferredSizeWidget {
         curve: Curves.linear,
       )),
       child: Container(
+        padding: EdgeInsets.only(
+          left: MediaQuery.of(context).padding.left,
+          right: MediaQuery.of(context).padding.right,
+        ),
         decoration: BoxDecoration(
           gradient: position! == 'top'
               ? const LinearGradient(
diff --git a/lib/plugin/pl_player/widgets/backward_seek.dart b/lib/plugin/pl_player/widgets/backward_seek.dart
index 35de0ae6..8fddf80a 100644
--- a/lib/plugin/pl_player/widgets/backward_seek.dart
+++ b/lib/plugin/pl_player/widgets/backward_seek.dart
@@ -20,6 +20,13 @@ class BackwardSeekIndicatorState extends State<BackwardSeekIndicator> {
 
   Timer? timer;
 
+  @override
+  void setState(VoidCallback fn) {
+    if (mounted) {
+      super.setState(fn);
+    }
+  }
+
   @override
   void initState() {
     super.initState();
diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart
index 35e7792a..b3ff37db 100644
--- a/lib/plugin/pl_player/widgets/bottom_control.dart
+++ b/lib/plugin/pl_player/widgets/bottom_control.dart
@@ -1,7 +1,6 @@
 import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 
@@ -36,7 +35,7 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
               final int max = _.durationSeconds.value;
               final int buffer = _.bufferedSeconds.value;
               if (value > max || max <= 0) {
-                return nil;
+                return const SizedBox();
               }
               return Padding(
                 padding: const EdgeInsets.only(left: 7, right: 7, bottom: 6),
diff --git a/lib/plugin/pl_player/widgets/common_btn.dart b/lib/plugin/pl_player/widgets/common_btn.dart
index 5f33311c..bf9467a8 100644
--- a/lib/plugin/pl_player/widgets/common_btn.dart
+++ b/lib/plugin/pl_player/widgets/common_btn.dart
@@ -17,7 +17,7 @@ class ComBtn extends StatelessWidget {
       height: 34,
       child: IconButton(
         style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
         ),
         onPressed: () {
           fuc!();
diff --git a/lib/plugin/pl_player/widgets/forward_seek.dart b/lib/plugin/pl_player/widgets/forward_seek.dart
index 43ddd322..7e3886ce 100644
--- a/lib/plugin/pl_player/widgets/forward_seek.dart
+++ b/lib/plugin/pl_player/widgets/forward_seek.dart
@@ -20,6 +20,13 @@ class ForwardSeekIndicatorState extends State<ForwardSeekIndicator> {
 
   Timer? timer;
 
+  @override
+  void setState(VoidCallback fn) {
+    if (mounted) {
+      super.setState(fn);
+    }
+  }
+
   @override
   void initState() {
     super.initState();
diff --git a/lib/plugin/pl_player/widgets/play_pause_btn.dart b/lib/plugin/pl_player/widgets/play_pause_btn.dart
index 6cbe31f0..7547a1cb 100644
--- a/lib/plugin/pl_player/widgets/play_pause_btn.dart
+++ b/lib/plugin/pl_player/widgets/play_pause_btn.dart
@@ -68,7 +68,7 @@ class PlayOrPauseButtonState extends State<PlayOrPauseButton>
       height: 34,
       child: IconButton(
         style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          padding: WidgetStateProperty.all(EdgeInsets.zero),
         ),
         onPressed: player.playOrPause,
         color: Colors.white,
diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart
index 7fda1bd8..2ca333f8 100644
--- a/lib/router/app_pages.dart
+++ b/lib/router/app_pages.dart
@@ -35,6 +35,7 @@ import '../pages/search/index.dart';
 import '../pages/search_result/index.dart';
 import '../pages/setting/extra_setting.dart';
 import '../pages/setting/index.dart';
+import '../pages/setting/pages/action_menu_set.dart';
 import '../pages/setting/pages/color_select.dart';
 import '../pages/setting/pages/display_mode.dart';
 import '../pages/setting/pages/font_size_select.dart';
@@ -174,6 +175,9 @@ class Routes {
     // navigation bar
     CustomGetPage(
         name: '/navbarSetting', page: () => const NavigationBarSetPage()),
+    // 操作菜单
+    CustomGetPage(
+        name: '/actionMenuSet', page: () => const ActionMenuSetPage()),
   ];
 }
 
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index bf98298b..853c58d0 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -26,7 +26,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
   static final List<MediaItem> _item = [];
   Box setting = GStrorage.setting;
   bool enableBackgroundPlay = false;
-  PlPlayerController player = PlPlayerController.getInstance();
+  PlPlayerController player = PlPlayerController();
 
   VideoPlayerServiceHandler() {
     revalidateSetting();
diff --git a/lib/services/audio_session.dart b/lib/services/audio_session.dart
index ea83a30a..d1d2a466 100644
--- a/lib/services/audio_session.dart
+++ b/lib/services/audio_session.dart
@@ -18,7 +18,7 @@ class AudioSessionHandler {
     session.configure(const AudioSessionConfiguration.music());
 
     session.interruptionEventStream.listen((event) {
-      final player = PlPlayerController.getInstance();
+      final player = PlPlayerController(videoType: 'none');
       if (event.begin) {
         if (!player.playerStatus.playing) return;
         switch (event.type) {
@@ -51,7 +51,7 @@ class AudioSessionHandler {
 
     // 耳机拔出暂停
     session.becomingNoisyEventStream.listen((_) {
-      final player = PlPlayerController.getInstance();
+      final player = PlPlayerController(videoType: 'none');
       if (player.playerStatus.playing) {
         player.pause();
       }
diff --git a/lib/services/shutdown_timer_service.dart b/lib/services/shutdown_timer_service.dart
index aa9c5ceb..06993f62 100644
--- a/lib/services/shutdown_timer_service.dart
+++ b/lib/services/shutdown_timer_service.dart
@@ -29,8 +29,8 @@ class ShutdownTimerService {
       return;
     }
     SmartDialog.showToast("设置 $scheduledExitInMinutes 分钟后定时关闭");
-    _shutdownTimer = Timer(Duration(minutes: scheduledExitInMinutes),
-        () => _shutdownDecider());
+    _shutdownTimer = Timer(
+        Duration(minutes: scheduledExitInMinutes), () => _shutdownDecider());
   }
 
   void _showTimeUpButPauseDialog() {
@@ -59,7 +59,7 @@ class ShutdownTimerService {
         // Start the 10-second timer to auto close the dialog
         _autoCloseDialogTimer?.cancel();
         _autoCloseDialogTimer = Timer(const Duration(seconds: 10), () {
-          SmartDialog.dismiss();// Close the dialog
+          SmartDialog.dismiss(); // Close the dialog
           _executeShutdown();
         });
         return AlertDialog(
@@ -88,7 +88,8 @@ class ShutdownTimerService {
       _showShutdownDialog();
       return;
     }
-    PlPlayerController plPlayerController = PlPlayerController.getInstance();
+    PlPlayerController plPlayerController =
+        PlPlayerController(videoType: 'none');
     if (!exitApp && !waitForPlayingCompleted) {
       if (!plPlayerController.playerStatus.playing) {
         //仅提示用户
@@ -108,19 +109,22 @@ class ShutdownTimerService {
     //该方法依赖耦合实现，不够优雅
     isWaiting = true;
   }
-  void handleWaitingFinished(){
-    if(isWaiting){
+
+  void handleWaitingFinished() {
+    if (isWaiting) {
       _showShutdownDialog();
       isWaiting = false;
     }
   }
+
   void _executeShutdown() {
     if (exitApp) {
       //退出app
       exit(0);
     } else {
       //暂停播放
-      PlPlayerController plPlayerController = PlPlayerController.getInstance();
+      PlPlayerController plPlayerController =
+          PlPlayerController(videoType: 'none');
       if (plPlayerController.playerStatus.playing) {
         plPlayerController.pause();
         waitForPlayingCompleted = true;
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index bb9d556f..a83b7809 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -2,8 +2,8 @@ import 'package:appscheme/appscheme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/utils/route_push.dart';
 import '../http/search.dart';
-import '../models/common/search_type.dart';
 import 'id_utils.dart';
 import 'url_utils.dart';
 import 'utils.dart';
@@ -20,7 +20,7 @@ class PiliSchame {
     /// 完整链接进入 b23.无效
     appScheme.getLatestScheme().then((SchemeEntity? value) {
       if (value != null) {
-        _fullPathPush(value);
+        _routePush(value);
       }
     });
 
@@ -37,7 +37,6 @@ class PiliSchame {
     final String scheme = value.scheme;
     final String host = value.host;
     final String path = value.path;
-
     if (scheme == 'bilibili') {
       if (host == 'root') {
         Navigator.popUntil(
@@ -69,7 +68,7 @@ class PiliSchame {
       } else if (host == 'bangumi') {
         if (path.startsWith('/season')) {
           final String seasonId = path.split('/').last;
-          _bangumiPush(int.parse(seasonId), null);
+          RoutePush.bangumiPush(int.parse(seasonId), null);
         }
       } else if (host == 'opus') {
         if (path.startsWith('/detail')) {
@@ -85,10 +84,18 @@ class PiliSchame {
         }
       } else if (host == 'search') {
         Get.toNamed('/searchResult', parameters: {'keyword': ''});
+      } else if (host == 'article') {
+        final String id = path.split('/').last.split('?').first;
+        Get.toNamed('/htmlRender', parameters: {
+          'url': 'https://www.bilibili.com/read/cv$id',
+          'title': 'cv$id',
+          'id': 'cv$id',
+          'dynamicType': 'read'
+        });
       }
     }
     if (scheme == 'https') {
-      _fullPathPush(value);
+      fullPathPush(value);
     }
   }
 
@@ -110,7 +117,7 @@ class PiliSchame {
         // ignore: always_specify_types
         (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
             arguments: <String, String?>{
-              'pic': null,
+              'pic': '',
               'heroTag': heroTag,
             }),
       );
@@ -119,45 +126,34 @@ class PiliSchame {
     }
   }
 
-  // 番剧跳转
-  static Future<void> _bangumiPush(int? seasonId, int? epId) async {
-    SmartDialog.showLoading<dynamic>(msg: '获取中...');
-    try {
-      var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);
-      if (result['status']) {
-        var bangumiDetail = result['data'];
-        final int cid = bangumiDetail.episodes!.first.cid;
-        final String bvid = IdUtils.av2bv(bangumiDetail.episodes!.first.aid);
-        final String heroTag = Utils.makeHeroTag(cid);
-        var epId = bangumiDetail.episodes!.first.id;
-        SmartDialog.dismiss().then(
-          (e) => Get.toNamed(
-            '/video?bvid=$bvid&cid=$cid&epId=$epId',
-            arguments: <String, dynamic>{
-              'pic': bangumiDetail.cover,
-              'heroTag': heroTag,
-              'videoType': SearchType.media_bangumi,
-            },
-          ),
-        );
-      } else {
-        SmartDialog.showToast(result['msg']);
-      }
-    } catch (e) {
-      SmartDialog.showToast('番剧获取失败：$e');
-    }
-  }
-
-  static Future<void> _fullPathPush(SchemeEntity value) async {
+  static Future<void> fullPathPush(SchemeEntity value) async {
     // https://m.bilibili.com/bangumi/play/ss39708
     // https | m.bilibili.com | /bangumi/play/ss39708
     // final String scheme = value.scheme!;
     final String host = value.host!;
     final String? path = value.path;
     Map<String, String>? query = value.query;
-    RegExp regExp = RegExp(r'^(www\.)?m?\.(bilibili\.com)$');
+    RegExp regExp = RegExp(r'^((www\.)|(m\.))?bilibili\.com$');
     if (regExp.hasMatch(host)) {
-      print('bilibili.com');
+      final String lastPathSegment = path!.split('/').last;
+      if (path.startsWith('/video')) {
+        Map matchRes = IdUtils.matchAvorBv(input: path);
+        if (matchRes.containsKey('AV')) {
+          _videoPush(matchRes['AV']! as int, null);
+        } else if (matchRes.containsKey('BV')) {
+          _videoPush(null, matchRes['BV'] as String);
+        } else {
+          SmartDialog.showToast('投稿匹配失败');
+        }
+      }
+      if (path.startsWith('/bangumi')) {
+        if (lastPathSegment.contains('ss')) {
+          RoutePush.bangumiPush(Utils.matchNum(lastPathSegment).first, null);
+        }
+        if (lastPathSegment.contains('ep')) {
+          RoutePush.bangumiPush(null, Utils.matchNum(lastPathSegment).first);
+        }
+      }
     } else if (host.contains('live')) {
       int roomId = int.parse(path!.split('/').last);
       Get.toNamed(
@@ -208,9 +204,9 @@ class PiliSchame {
         case 'bangumi':
           print('番剧');
           if (area.startsWith('ep')) {
-            _bangumiPush(null, matchNum(area).first);
+            RoutePush.bangumiPush(null, Utils.matchNum(area).first);
           } else if (area.startsWith('ss')) {
-            _bangumiPush(matchNum(area).first, null);
+            RoutePush.bangumiPush(Utils.matchNum(area).first, null);
           }
           break;
         case 'video':
@@ -226,30 +222,48 @@ class PiliSchame {
           break;
         case 'read':
           print('专栏');
+          String id = 'cv${Utils.matchNum(query!['id']!).first}';
+          Get.toNamed('/htmlRender', parameters: {
+            'url': value.dataString!,
+            'title': '',
+            'id': id,
+            'dynamicType': 'read'
+          });
           break;
         case 'space':
           print('个人空间');
           Get.toNamed('/member?mid=$area', arguments: {'face': ''});
           break;
+        default:
+          final Map<String, dynamic> map =
+              IdUtils.matchAvorBv(input: area.split('?').first);
+          if (map.containsKey('AV')) {
+            _videoPush(map['AV']! as int, null);
+          } else if (map.containsKey('BV')) {
+            _videoPush(null, map['BV'] as String);
+          } else {
+            Get.toNamed(
+              '/webview',
+              parameters: {
+                'url': value.dataString ?? "",
+                'type': 'url',
+                'pageTitle': ''
+              },
+            );
+          }
+          break;
       }
     }
   }
 
-  static List<int> matchNum(String str) {
-    final RegExp regExp = RegExp(r'\d+');
-    final Iterable<Match> matches = regExp.allMatches(str);
-
-    return matches.map((Match match) => int.parse(match.group(0)!)).toList();
-  }
-
   static void _handleEpisodePath(String lastPathSegment, String redirectUrl) {
     final String seasonId = _extractIdFromPath(lastPathSegment);
-    _bangumiPush(null, matchNum(seasonId).first);
+    RoutePush.bangumiPush(null, Utils.matchNum(seasonId).first);
   }
 
   static void _handleSeasonPath(String lastPathSegment, String redirectUrl) {
     final String seasonId = _extractIdFromPath(lastPathSegment);
-    _bangumiPush(matchNum(seasonId).first, null);
+    RoutePush.bangumiPush(Utils.matchNum(seasonId).first, null);
   }
 
   static String _extractIdFromPath(String lastPathSegment) {
diff --git a/lib/utils/download.dart b/lib/utils/download.dart
index 2aff8999..42dbbecf 100644
--- a/lib/utils/download.dart
+++ b/lib/utils/download.dart
@@ -15,24 +15,7 @@ class DownloadUtils {
     PermissionStatus status = await Permission.storage.status;
     if (status == PermissionStatus.denied ||
         status == PermissionStatus.permanentlyDenied) {
-      SmartDialog.show(
-        useSystem: true,
-        animationType: SmartAnimationType.centerFade_otherSlide,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: const Text('提示'),
-            content: const Text('存储权限未授权'),
-            actions: [
-              TextButton(
-                onPressed: () async {
-                  openAppSettings();
-                },
-                child: const Text('去授权'),
-              )
-            ],
-          );
-        },
-      );
+      await permissionDialog('提示', '存储权限未授权');
       return false;
     } else {
       return true;
@@ -45,24 +28,7 @@ class DownloadUtils {
     PermissionStatus status = await Permission.photos.status;
     if (status == PermissionStatus.denied ||
         status == PermissionStatus.permanentlyDenied) {
-      SmartDialog.show(
-        useSystem: true,
-        animationType: SmartAnimationType.centerFade_otherSlide,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: const Text('提示'),
-            content: const Text('相册权限未授权'),
-            actions: [
-              TextButton(
-                onPressed: () async {
-                  openAppSettings();
-                },
-                child: const Text('去授权'),
-              )
-            ],
-          );
-        },
-      );
+      await permissionDialog('提示', '相册权限未授权');
       return false;
     } else {
       return true;
@@ -72,17 +38,16 @@ class DownloadUtils {
   static Future<bool> downloadImg(String imgUrl,
       {String imgType = 'cover'}) async {
     try {
-      if (!Platform.isAndroid || !await requestPhotoPer()) {
-        return false;
-      }
-      final androidInfo = await DeviceInfoPlugin().androidInfo;
-      if (androidInfo.version.sdkInt <= 32) {
-        if (!await requestStoragePer()) {
-          return false;
-        }
-      } else {
-        if (!await requestPhotoPer()) {
-          return false;
+      if (Platform.isAndroid) {
+        final androidInfo = await DeviceInfoPlugin().androidInfo;
+        if (androidInfo.version.sdkInt <= 32) {
+          if (!await requestStoragePer()) {
+            return false;
+          }
+        } else {
+          if (!await requestPhotoPer()) {
+            return false;
+          }
         }
       }
 
@@ -101,13 +66,38 @@ class DownloadUtils {
       );
       SmartDialog.dismiss();
       if (result.isSuccess) {
-        await SmartDialog.showToast('「${'$picName.$imgSuffix'}」已保存 ');
+        SmartDialog.showToast('「${'$picName.$imgSuffix'}」已保存 ');
+        return true;
+      } else {
+        await permissionDialog('保存失败', '相册权限未授权');
+        return false;
       }
-      return true;
     } catch (err) {
       SmartDialog.dismiss();
       SmartDialog.showToast(err.toString());
-      return true;
+      return false;
     }
   }
+
+  static Future permissionDialog(String title, String content,
+      {Function? onGranted}) async {
+    await SmartDialog.show(
+      useSystem: true,
+      animationType: SmartAnimationType.centerFade_otherSlide,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: Text(title),
+          content: Text(content),
+          actions: [
+            TextButton(
+              onPressed: () async {
+                openAppSettings();
+              },
+              child: const Text('去授权'),
+            )
+          ],
+        );
+      },
+    );
+  }
 }
diff --git a/lib/utils/global_data.dart b/lib/utils/global_data.dart
index 29791210..97bff5a5 100644
--- a/lib/utils/global_data.dart
+++ b/lib/utils/global_data.dart
@@ -11,7 +11,8 @@ class GlobalData {
   bool enablePlayerControlAnimation = true;
   final bool enableMYBar =
       setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
-
+  List<String> actionTypeSort = setting.get(SettingBoxKey.actionTypeSort,
+      defaultValue: ['like', 'coin', 'collect', 'watchLater', 'share']);
   // 私有构造函数
   GlobalData._();
 
diff --git a/lib/utils/image_save.dart b/lib/utils/image_save.dart
new file mode 100644
index 00000000..0727ad68
--- /dev/null
+++ b/lib/utils/image_save.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/utils/download.dart';
+
+Future imageSaveDialog(context, videoItem, closeFn) {
+  final double imgWidth =
+      MediaQuery.sizeOf(context).width - StyleString.safeSpace * 2;
+  return SmartDialog.show(
+    animationType: SmartAnimationType.centerScale_otherSlide,
+    builder: (context) => Container(
+      margin: const EdgeInsets.symmetric(horizontal: StyleString.safeSpace),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surface,
+        borderRadius: BorderRadius.circular(10.0),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Stack(
+            children: [
+              NetworkImgLayer(
+                width: imgWidth,
+                height: imgWidth / StyleString.aspectRatio,
+                src: videoItem.pic! as String,
+                quality: 100,
+              ),
+              Positioned(
+                right: 8,
+                top: 8,
+                child: Container(
+                  width: 30,
+                  height: 30,
+                  decoration: BoxDecoration(
+                      color: Colors.black.withOpacity(0.3),
+                      borderRadius:
+                          const BorderRadius.all(Radius.circular(20))),
+                  child: IconButton(
+                    style: ButtonStyle(
+                      padding: WidgetStateProperty.all(EdgeInsets.zero),
+                    ),
+                    onPressed: () => closeFn!(),
+                    icon: const Icon(
+                      Icons.close,
+                      size: 18,
+                      color: Colors.white,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(12, 10, 8, 10),
+            child: Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    videoItem.title! as String,
+                    style: Theme.of(context).textTheme.titleSmall,
+                  ),
+                ),
+                const SizedBox(width: 4),
+                IconButton(
+                  tooltip: '保存封面图',
+                  onPressed: () async {
+                    bool saveStatus = await DownloadUtils.downloadImg(
+                      videoItem.pic != null
+                          ? videoItem.pic as String
+                          : videoItem.cover as String,
+                    );
+                    // 保存成功，自动关闭弹窗
+                    if (saveStatus) {
+                      closeFn?.call();
+                    }
+                  },
+                  icon: const Icon(Icons.download, size: 20),
+                )
+              ],
+            ),
+          ),
+        ],
+      ),
+    ),
+  );
+}
diff --git a/lib/utils/login.dart b/lib/utils/login.dart
index 59c53027..2687a8c2 100644
--- a/lib/utils/login.dart
+++ b/lib/utils/login.dart
@@ -2,12 +2,18 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:crypto/crypto.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/http/user.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/pages/mine/index.dart';
+import 'package:pilipala/utils/cookie.dart';
+import 'package:pilipala/utils/storage.dart';
 import 'package:uuid/uuid.dart';
 
 class LoginUtils {
@@ -57,4 +63,56 @@ class LoginUtils {
     String uuid = getUUID() + getUUID();
     return 'XY${uuid.substring(0, 35).toUpperCase()}';
   }
+
+  static confirmLogin(url, controller) async {
+    var content = '';
+    if (url != null) {
+      content = '${content + url}; \n';
+    }
+    try {
+      await SetCookie.onSet();
+      final result = await UserHttp.userInfo();
+      if (result['status'] && result['data'].isLogin) {
+        SmartDialog.showToast('登录成功');
+        try {
+          Box userInfoCache = GStrorage.userInfo;
+          if (!userInfoCache.isOpen) {
+            userInfoCache = await Hive.openBox('userInfo');
+          }
+          await userInfoCache.put('userInfoCache', result['data']);
+
+          final HomeController homeCtr = Get.find<HomeController>();
+          homeCtr.updateLoginStatus(true);
+          homeCtr.userFace.value = result['data'].face;
+          final MediaController mediaCtr = Get.find<MediaController>();
+          mediaCtr.mid = result['data'].mid;
+          await LoginUtils.refreshLoginStatus(true);
+        } catch (err) {
+          SmartDialog.show(builder: (BuildContext context) {
+            return AlertDialog(
+              title: const Text('登录遇到问题'),
+              content: Text(err.toString()),
+              actions: [
+                TextButton(
+                  onPressed: controller != null
+                      ? () => controller.reload()
+                      : SmartDialog.dismiss,
+                  child: const Text('确认'),
+                )
+              ],
+            );
+          });
+        }
+        Get.back();
+      } else {
+        // 获取用户信息失败
+        SmartDialog.showToast(result['msg']);
+        Clipboard.setData(ClipboardData(text: result['msg']));
+      }
+    } catch (e) {
+      SmartDialog.showNotify(msg: e.toString(), notifyType: NotifyType.warning);
+      content = content + e.toString();
+      Clipboard.setData(ClipboardData(text: content));
+    }
+  }
 }
diff --git a/lib/utils/route_push.dart b/lib/utils/route_push.dart
new file mode 100644
index 00000000..9ee28846
--- /dev/null
+++ b/lib/utils/route_push.dart
@@ -0,0 +1,68 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/bangumi/info.dart';
+import 'package:pilipala/models/common/search_type.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class RoutePush {
+  // 番剧跳转
+  static Future<void> bangumiPush(int? seasonId, int? epId,
+      {String? heroTag}) async {
+    SmartDialog.showLoading<dynamic>(msg: '获取中...');
+    try {
+      var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);
+      await SmartDialog.dismiss();
+      if (result['status']) {
+        if (result['data'].episodes.isEmpty) {
+          SmartDialog.showToast('资源获取失败');
+          return;
+        }
+        final BangumiInfoModel bangumiDetail = result['data'];
+        final EpisodeItem episode = bangumiDetail.episodes!.first;
+        final int epId = episode.id!;
+        final int cid = episode.cid!;
+        final String bvid = episode.bvid!;
+        final String cover = episode.cover!;
+        final Map arguments = <String, dynamic>{
+          'pic': cover,
+          'videoType': SearchType.media_bangumi,
+          // 'bangumiItem': bangumiDetail,
+        };
+        arguments['heroTag'] = heroTag ?? Utils.makeHeroTag(cid);
+        Get.toNamed(
+          '/video?bvid=$bvid&cid=$cid&epId=$epId',
+          arguments: arguments,
+        );
+      } else {
+        SmartDialog.showToast(result['msg']);
+      }
+    } catch (e) {
+      SmartDialog.showToast('番剧获取失败：$e');
+    }
+  }
+
+  // 登录跳转
+  static Future<void> loginPush() async {
+    await Get.toNamed(
+      '/webview',
+      parameters: {
+        'url': 'https://passport.bilibili.com/h5-app/passport/login',
+        'type': 'login',
+        'pageTitle': '登录bilibili',
+      },
+    );
+  }
+
+  // 登录跳转
+  static Future<void> loginRedirectPush() async {
+    await Get.offAndToNamed(
+      '/webview',
+      parameters: {
+        'url': 'https://passport.bilibili.com/h5-app/passport/login',
+        'type': 'login',
+        'pageTitle': '登录bilibili',
+      },
+    );
+  }
+}
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 29cf1846..4a163446 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -149,7 +149,8 @@ class SettingBoxKey {
       tabbarSort = 'tabbarSort', // 首页tabbar
       dynamicBadgeMode = 'dynamicBadgeMode',
       enableGradientBg = 'enableGradientBg',
-      navBarSort = 'navBarSort';
+      navBarSort = 'navBarSort',
+      actionTypeSort = 'actionTypeSort';
 }
 
 class LocalCacheKey {
diff --git a/lib/utils/url_utils.dart b/lib/utils/url_utils.dart
index cf0ef9e2..573f9f9d 100644
--- a/lib/utils/url_utils.dart
+++ b/lib/utils/url_utils.dart
@@ -16,7 +16,7 @@ class UrlUtils {
     };
     try {
       final response = await dio.get(url);
-      if (response.statusCode == 302) {
+      if (response.statusCode == 302 || response.statusCode == 301) {
         redirectUrl = response.headers['location']?.first as String;
         if (redirectUrl.endsWith('/')) {
           redirectUrl = redirectUrl.substring(0, redirectUrl.length - 1);
@@ -42,12 +42,14 @@ class UrlUtils {
     final Map matchRes = IdUtils.matchAvorBv(input: pathSegment);
     if (matchRes.containsKey('BV')) {
       final String bv = matchRes['BV'];
-      final int cid = await SearchHttp.ab2c(bvid: bv);
+      final Map res = await SearchHttp.ab2cWithPic(bvid: bv);
+      final int cid = res['cid'];
+      final String? pic = res['pic'];
       final String heroTag = Utils.makeHeroTag(bv);
       await Get.toNamed(
         '/video?bvid=$bv&cid=$cid',
         arguments: <String, String?>{
-          'pic': '',
+          'pic': pic,
           'heroTag': heroTag,
         },
       );
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 987f57c1..e50c295c 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -109,7 +109,6 @@ class Utils {
           toInt: false,
           formatType: formatType);
     }
-    print('distance: $distance');
     if (distance <= 60) {
       return '刚刚';
     } else if (distance <= 3600) {
@@ -384,4 +383,11 @@ class Utils {
     List<int> randomBytes = generateRandomBytes(minLength, maxLength);
     return base64.encode(randomBytes);
   }
+
+  static List<int> matchNum(String str) {
+    final RegExp regExp = RegExp(r'\d+');
+    final Iterable<Match> matches = regExp.allMatches(str);
+
+    return matches.map((Match match) => int.parse(match.group(0)!)).toList();
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
index a64c85c0..5c6f2b43 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -17,14 +17,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.2.0"
-  animations:
-    dependency: "direct main"
-    description:
-      name: animations
-      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.11"
   appscheme:
     dependency: "direct main"
     description:
@@ -69,10 +61,10 @@ packages:
     dependency: "direct main"
     description:
       name: audio_service
-      sha256: a4d989f1225ea9621898d60f23236dcbfc04876fa316086c23c5c4af075dbac4
+      sha256: "4547c312a94f9cb2c48b60823fb190767cbd63454a83c73049384d5d3cba4650"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.18.12"
+    version: "0.18.13"
   audio_service_platform_interface:
     dependency: transitive
     description:
@@ -85,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: audio_service_web
-      sha256: "523e64ddc914c714d53eec2da85bba1074f08cf26c786d4efb322de510815ea7"
+      sha256: "9d7d5ae5f98a5727f2580fad73062f2484f400eef6cef42919413268e62a363e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.1"
+    version: "0.1.2"
   audio_session:
     dependency: "direct main"
     description:
@@ -101,10 +93,10 @@ packages:
     dependency: "direct main"
     description:
       name: audio_video_progress_bar
-      sha256: ccc7d7b83d2a16c52d4a7fb332faabd1baa053fb0e4c16815aefd3945ab33b81
+      sha256: "552b1f73c56c4c88407999e0a8507176f60c56de3e6d63bc20a0eab48467d4c9"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   auto_orientation:
     dependency: "direct main"
     description:
@@ -213,10 +205,10 @@ packages:
     dependency: "direct main"
     description:
       name: catcher_2
-      sha256: "9cf33d2befd10058374e5fc6177577fdd938d73d9c06810de81cf91311a7ce98"
+      sha256: "2c2c6f8cf8c817730cd1dbb010d55292396930e7a3d42c04c3039e3fd411a2f8"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.3"
+    version: "1.2.6"
   characters:
     dependency: transitive
     description:
@@ -269,10 +261,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9
+      sha256: db7a4e143dc72cc3cb2044ef9b052a7ebfe729513e6a82943bc3526f784365b8
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.3"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -301,10 +293,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e
+      sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.3+8"
+    version: "0.3.4+1"
   crypto:
     dependency: "direct main"
     description:
@@ -333,10 +325,10 @@ packages:
     dependency: "direct main"
     description:
       name: custom_sliding_segmented_control
-      sha256: "05b73fa48d57218bfdf806bad68a859812b216cd81fe81c6cbefde89f39eb257"
+      sha256: "53c3e931c3ae1f696085d1ec70ac8e934da836595a9b7d9b88fdd0fcbf2a5574"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.3"
   dart_style:
     dependency: transitive
     description:
@@ -461,10 +453,10 @@ packages:
     dependency: transitive
     description:
       name: extended_image_library
-      sha256: "9b55fc5ebc65fad984de66b8f177a1bef2a84d79203c9c213f75ff83c2c29edd"
+      sha256: c9caee8fe9b6547bd41c960c4f2d1ef8e34321804de6a1777f1d614a24247ad6
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.4"
   extended_list:
     dependency: transitive
     description:
@@ -621,10 +613,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_volume_controller
-      sha256: "0f10cc759499cb6c3e152a8f6ff8e5ce385b99db7e1f586d1a29d8e6c11f4082"
+      sha256: fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -682,10 +674,10 @@ packages:
     dependency: "direct main"
     description:
       name: gt3_flutter_plugin
-      sha256: f12bff2bfbcf27467833f8d564dcc24ee2f1b3254a7c7cf5eb2c4590baf11cc1
+      sha256: "08f35692e937770ad6b3e2017eb8ef81839a82b8a63f5acf3abab14b688fc36c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.0.8"
+    version: "0.1.0"
   hive:
     dependency: "direct main"
     description:
@@ -722,10 +714,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.1"
   http2:
     dependency: transitive
     description:
@@ -770,10 +762,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -798,6 +790,30 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.8.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "10.0.4"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.3"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -834,10 +850,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: "6bbb9d6f7056729537a4309bda2e74e18e5d9f14302489cc1e93f33b3fe32cac"
+      sha256: af05cc8714f356fd1f3888fb6741cbe9fbe25cdb6eedbab80e1a6db21047d4a4
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2+1"
+    version: "2.3.0"
   logging:
     dependency: transitive
     description:
@@ -846,37 +862,46 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
+  lottie:
+    dependency: "direct main"
+    description:
+      name: lottie
+      sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.2"
   mailer:
     dependency: transitive
     description:
       name: mailer
-      sha256: "57f6dd1496699999a7bfd0aa6be0645384f477f4823e16d4321c40a434346382"
+      sha256: d25d89555c1031abacb448f07b801d7c01b4c21d4558e944b12b64394c84a3cb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.0.1"
+    version: "6.1.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   media_kit:
     dependency: "direct main"
     description:
-      name: media_kit
-      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: media_kit
+      ref: HEAD
+      resolved-ref: "285f7919bbf4a7d89a62615b14a3766a171ad575"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.1.10+1"
   media_kit_libs_android_video:
     dependency: transitive
@@ -913,10 +938,11 @@ packages:
   media_kit_libs_video:
     dependency: "direct main"
     description:
-      name: media_kit_libs_video
-      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: "libs/universal/media_kit_libs_video"
+      ref: HEAD
+      resolved-ref: "285f7919bbf4a7d89a62615b14a3766a171ad575"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.0.4"
   media_kit_libs_windows_video:
     dependency: transitive
@@ -937,35 +963,28 @@ packages:
   media_kit_video:
     dependency: "direct main"
     description:
-      name: media_kit_video
-      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: media_kit_video
+      ref: HEAD
+      resolved-ref: "285f7919bbf4a7d89a62615b14a3766a171ad575"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.2.4"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.10.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
-  nil:
-    dependency: "direct main"
-    description:
-      name: nil
-      sha256: ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.1"
+    version: "1.0.5"
   nm:
     dependency: transitive
     description:
@@ -1019,10 +1038,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -1035,10 +1054,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
@@ -1051,10 +1070,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1199,6 +1218,22 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
+  qr_flutter:
+    dependency: "direct main"
+    description:
+      name: qr_flutter
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.1.0"
   rxdart:
     dependency: transitive
     description:
@@ -1219,10 +1254,10 @@ packages:
     dependency: "direct main"
     description:
       name: saver_gallery
-      sha256: "2657953427ebe5a3b2d08157d41587c01923ccce3f1a616d55082be7470f8530"
+      sha256: "0f740608072053a0da3b19cc5812a87e36f5c3c0b959d2475c4eb3d697f4a782"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
   screen_brightness:
     dependency: "direct main"
     description:
@@ -1432,10 +1467,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   timing:
     dependency: transitive
     description:
@@ -1464,10 +1499,10 @@ packages:
     dependency: "direct main"
     description:
       name: universal_platform
-      sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
+      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.0+1"
+    version: "1.1.0"
   uri_parser:
     dependency: transitive
     description:
@@ -1480,10 +1515,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.2.2"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description:
@@ -1496,10 +1531,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.2.1"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1528,10 +1563,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9"
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.2"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1588,6 +1623,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.0+2"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "14.2.1"
   volume_controller:
     dependency: transitive
     description:
@@ -1600,18 +1643,18 @@ packages:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d
+      sha256: "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.4"
+    version: "1.2.1"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
+      sha256: "582f2f7aecc7376332d961a0dd1efa9378ce117657e0ade55d9ff72699a55e82"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   watcher:
     dependency: transitive
     description:
@@ -1632,10 +1675,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
   web_socket_channel:
     dependency: transitive
     description:
@@ -1656,34 +1699,34 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
+      sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.5.0"
+    version: "4.8.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: e313dcdf45d4c95bcb8960351ef2389b7f0687b90bc92483f7f7983ae5758456
+      sha256: f42447ca49523f11d8f70abea55ea211b3cafe172dd7a0e7ac007bb35dd356dc
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.13.0"
+    version: "3.16.4"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "68e86162aa8fc646ae859e1585995c096c95fc2476881fa0c4a8d10f56013a5a"
+      sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.8.0"
+    version: "2.10.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
+      sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.10.2"
+    version: "3.13.1"
   win32:
     dependency: transitive
     description:
@@ -1725,5 +1768,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 27b8b720..66187abf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.21+1021
+version: 1.0.23+1023
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -44,7 +44,7 @@ dependencies:
   dio: ^5.4.1
   cookie_jar: ^4.0.8
   dio_cookie_manager: ^3.1.1
-  connectivity_plus: ^6.0.1
+  connectivity_plus: ^6.0.3
   dio_http2_adapter: ^2.3.1+1
 
   # 图片
@@ -66,7 +66,7 @@ dependencies:
   # cookie 管理
   webview_cookie_manager: ^2.0.6
   # 浏览器
-  webview_flutter: ^4.5.0
+  webview_flutter: ^4.8.0
   # 解决sliver滑动不同步
   extended_nested_scroll_view: ^6.2.1
   # 上拉加载
@@ -79,7 +79,7 @@ dependencies:
   flutter_smart_dialog: ^4.9.4
   # 下滑关闭
   dismissible_page: ^1.0.2
-  custom_sliding_segmented_control: ^1.7.5
+  custom_sliding_segmented_control: ^1.8.3
   # 加密
   crypto: ^3.0.3
   encrypt: ^5.0.3
@@ -90,23 +90,22 @@ dependencies:
   media_kit_libs_video: ^1.0.4
 
   # 媒体通知
-  audio_service: ^0.18.12
-  audio_session: ^0.1.16
+  audio_service: ^0.18.13
+  audio_session: ^0.1.18
 
   # 音量、亮度、屏幕控制
-  flutter_volume_controller: ^1.3.1
+  flutter_volume_controller: ^1.3.2
   screen_brightness: ^0.2.2+1
-  wakelock_plus: ^1.1.1
-  universal_platform: ^1.0.0+1
+  wakelock_plus: ^1.1.6
+  universal_platform: ^1.1.0
   # 进度条
-  audio_video_progress_bar: ^2.0.2
+  audio_video_progress_bar: ^2.0.3
   auto_orientation: ^2.3.1
   protobuf: ^3.0.0
-  animations: ^2.0.11
 
   # 获取appx信息
-  package_info_plus: ^4.1.0
-  url_launcher: ^6.1.14
+  package_info_plus: ^4.2.0
+  url_launcher: ^6.2.6
   flutter_svg: ^2.0.10+1
   # 防抖节流
   easy_debounce: ^2.0.3
@@ -133,19 +132,21 @@ dependencies:
   # html渲染
   flutter_html: ^3.0.0-beta.2
   # 极验
-  gt3_flutter_plugin: ^0.0.8
+  gt3_flutter_plugin: ^0.1.0
   uuid: ^3.0.7
   scrollable_positioned_list: ^0.3.8
-  nil: ^1.1.1
-  catcher_2: ^1.2.3
-  logger: ^2.0.2+1
-  path: 1.8.3
+  catcher_2: ^1.2.6
+  logger: ^2.3.0
+  path: ^1.9.0
   # 电池优化
   disable_battery_optimization: ^1.1.1
   # 展开/收起
   expandable: ^5.0.1
   # 投屏
   dlna_dart: ^0.0.8
+  lottie: ^3.1.2
+  # 二维码
+  qr_flutter: ^4.1.0
 
 dev_dependencies:
   flutter_test:
@@ -165,6 +166,20 @@ dev_dependencies:
   hive_generator: ^2.0.0
   build_runner: ^2.4.8
 
+dependency_overrides:
+  media_kit:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit
+  media_kit_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit_video
+  media_kit_libs_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/universal/media_kit_libs_video
+
 flutter_launcher_icons:
   android: true
   ios: true
@@ -191,6 +206,7 @@ flutter:
 
   # To add assets to your application, add an assets section, like this:
   assets:
+    - assets/
     - assets/images/
     - assets/images/lv/
     - assets/images/logo/