fix: 合集顺序播放

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.guozhigq.pilipala">
     <queries>
         <intent>
@@ -40,13 +39,9 @@
         android:label="PiliPala"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:enableOnBackInvokedCallback="true"
-        android:allowBackup="false"
-        android:fullBackupContent="false"
-        tools:replace="android:allowBackup">
+        android:enableOnBackInvokedCallback="true">
         <activity
-            android:name="com.ryanheise.audioservice.AudioServiceActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
@@ -64,27 +59,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- ADD THIS "SERVICE" element -->
-            <service
-                android:name="com.ryanheise.audioservice.AudioService"
-                android:exported="true"
-                android:foregroundServiceType="mediaPlayback"
-                tools:ignore="Instantiatable">
-                <intent-filter>
-                    <action android:name="android.media.browse.MediaBrowserService" />
-                </intent-filter>
-            </service>
-
-            <!-- ADD THIS "RECEIVER" element -->
-            <receiver
-                android:name="com.ryanheise.audioservice.MediaButtonReceiver"
-                android:exported="true"
-                tools:ignore="Instantiatable">
-                <intent-filter>
-                    <action android:name="android.intent.action.MEDIA_BUTTON" />
-                </intent-filter>
-            </receiver>
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -248,24 +222,6 @@
 
             </intent-filter>
         </activity>
-        <service 
-            android:name="com.ryanheise.audioservice.AudioService"
-            android:foregroundServiceType="mediaPlayback"
-            android:exported="true" 
-            tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService" />
-            </intent-filter>
-        </service>
-
-        <receiver 
-            android:name="com.ryanheise.audioservice.MediaButtonReceiver"
-            android:exported="true" 
-            tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver> 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -278,8 +234,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <!--
       Media access permissions.
       Android 13 or higher.
@@ -287,8 +241,4 @@
       -->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 </manifest>

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

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

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

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

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

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

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

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

change_log/1.0.10.1016.md

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

change_log/1.0.11.1112.md

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

change_log/1.0.8.0917.md

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

change_log/1.0.9.1015.md

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

ios/Podfile

@@ -37,11 +37,5 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
-        '$(inherited)',
-        'AUDIO_SESSION_MICROPHONE=0'
-      ]
-    end
   end
 end

ios/Podfile.lock

@@ -1,10 +1,6 @@
 PODS:
   - appscheme (1.0.4):
     - Flutter
-  - audio_service (0.0.1):
-    - Flutter
-  - audio_session (0.0.1):
-    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
@@ -16,15 +12,8 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - gt3_flutter_plugin (0.0.8):
+  - image_gallery_saver (2.0.2):
     - Flutter
-<<<<<<< HEAD
-  - just_audio (0.0.1):
-    - Flutter
-=======
-    - GT3Captcha-iOS
-  - GT3Captcha-iOS (0.15.8.3)
->>>>>>> main
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -39,8 +28,6 @@ PODS:
   - permission_handler_apple (9.1.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
-  - saver_gallery (0.0.1):
-    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - share_plus (0.0.1):
@@ -65,25 +52,17 @@ PODS:
 
 DEPENDENCIES:
   - appscheme (from `.symlinks/plugins/appscheme/ios`)
-  - audio_service (from `.symlinks/plugins/audio_service/ios`)
-  - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-<<<<<<< HEAD
   - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
-  - just_audio (from `.symlinks/plugins/just_audio/ios`)
-=======
-  - gt3_flutter_plugin (from `.symlinks/plugins/gt3_flutter_plugin/ios`)
->>>>>>> main
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
@@ -98,16 +77,11 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - FMDB
-    - GT3Captcha-iOS
     - ReachabilitySwift
 
 EXTERNAL SOURCES:
   appscheme:
     :path: ".symlinks/plugins/appscheme/ios"
-  audio_service:
-    :path: ".symlinks/plugins/audio_service/ios"
-  audio_session:
-    :path: ".symlinks/plugins/audio_session/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
@@ -116,15 +90,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-<<<<<<< HEAD
   image_gallery_saver:
     :path: ".symlinks/plugins/image_gallery_saver/ios"
-  just_audio:
-    :path: ".symlinks/plugins/just_audio/ios"
-=======
-  gt3_flutter_plugin:
-    :path: ".symlinks/plugins/gt3_flutter_plugin/ios"
->>>>>>> main
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_native_event_loop:
@@ -137,8 +104,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  saver_gallery:
-    :path: ".symlinks/plugins/saver_gallery/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
@@ -162,20 +127,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8
-  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
-  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-<<<<<<< HEAD
   image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
-  just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
-=======
-  gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23
-  GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6
->>>>>>> main
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
@@ -183,7 +140,6 @@ SPEC CHECKSUMS:
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
@@ -195,6 +151,6 @@ SPEC CHECKSUMS:
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
-PODFILE CHECKSUM: fc8a34c4ba2e14d31df90bf03cf419a764f2778c
+PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
 COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -140,7 +140,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				5A372F23F3CF0118D6526BAC /* [CP] Embed Pods Frameworks */,
-				B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -269,23 +268,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

ios/Runner/Info.plist

@@ -103,13 +103,5 @@
 				</array>
 			</dict>
 		</array>
-<<<<<<< HEAD
-		<!-- audio service配置 -->
-=======
->>>>>>> main
-		<key>UIBackgroundModes</key>
-		<array>
-			<string>audio</string>
-		</array>
 	</dict>
 </plist>

lib/common/widgets/html_render.dart

@@ -1,7 +1,7 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
 
 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
@@ -20,47 +20,35 @@ class HtmlRender extends StatelessWidget {
   Widget build(BuildContext context) {
     return Html(
       data: htmlContent,
+      // tagsList: Html.tags..addAll(["form", "label", "input"]),
       onLinkTap: (url, buildContext, attributes) => {},
       extensions: [
         TagExtension(
           tagsToExtend: {"img"},
           builder: (extensionContext) {
-            try {
-              Map attributes = extensionContext.attributes;
-              List key = attributes.keys.toList();
-              String? imgUrl = key.contains('src')
-                  ? attributes['src']
-                  : attributes['data-src'];
-              if (imgUrl!.startsWith('//')) {
-                imgUrl = 'https:$imgUrl';
-              }
-              if (imgUrl.startsWith('http://')) {
-                imgUrl = imgUrl.replaceAll('http://', 'https://');
-              }
-              imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
-              bool isEmote = imgUrl.contains('/emote/');
-              bool isMall = imgUrl.contains('/mall/');
-              if (isMall) {
-                return const SizedBox();
-              }
-              // bool inTable =
-              //     extensionContext.element!.previousElementSibling == null ||
-              //         extensionContext.element!.nextElementSibling == null;
-              // imgUrl = Utils().imageUrl(imgUrl!);
-              // return Image.network(
-              //   imgUrl,
-              //   width: isEmote ? 22 : null,
-              //   height: isEmote ? 22 : null,
-              // );
-              return NetworkImgLayer(
-                width: isEmote ? 22 : Get.size.width - 24,
-                height: isEmote ? 22 : 200,
-                src: imgUrl,
-              );
-            } catch (err) {
-              print(err);
-              return const SizedBox();
+            String? imgUrl = extensionContext.attributes['src'];
+            if (imgUrl!.startsWith('//')) {
+              imgUrl = 'https:$imgUrl';
             }
+            if (imgUrl.startsWith('http://')) {
+              imgUrl = imgUrl.replaceAll('http://', 'https://');
+            }
+
+            print(imgUrl);
+            bool isEmote = imgUrl.contains('/emote/');
+            bool isMall = imgUrl.contains('/mall/');
+            if (isMall) {
+              return SizedBox();
+            }
+            // bool inTable =
+            //     extensionContext.element!.previousElementSibling == null ||
+            //         extensionContext.element!.nextElementSibling == null;
+            // imgUrl = Utils().imageUrl(imgUrl!);
+            return Image.network(
+              imgUrl,
+              width: isEmote ? 22 : null,
+              height: isEmote ? 22 : null,
+            );
           },
         ),
       ],
@@ -75,13 +63,11 @@ class HtmlRender extends StatelessWidget {
           textDecoration: TextDecoration.none,
         ),
         "p": Style(
-          margin: Margins.only(bottom: 10),
+          margin: Margins.only(bottom: 0),
         ),
         "span": Style(
           fontSize: FontSize.medium,
-          height: Height(1.65),
         ),
-        "div": Style(height: Height.auto()),
         "li > p": Style(
           display: Display.inline,
         ),
@@ -89,7 +75,61 @@ class HtmlRender extends StatelessWidget {
           padding: HtmlPaddings.only(bottom: 4),
           textAlign: TextAlign.justify,
         ),
-        "img": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "image": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "p > img": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "code": Style(
+            backgroundColor: Theme.of(context).colorScheme.onInverseSurface),
+        "code > span": Style(textAlign: TextAlign.start),
+        "hr": Style(
+          margin: Margins.zero,
+          padding: HtmlPaddings.zero,
+          border: Border(
+            top: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'table': Style(
+          border: Border(
+            right: BorderSide(
+              width: 0.5,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+            bottom: BorderSide(
+              width: 0.5,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'tr': Style(
+          border: Border(
+            top: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+            left: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'thead': Style(
+          backgroundColor: Theme.of(context).colorScheme.background,
+        ),
+        'th': Style(
+          padding: HtmlPaddings.only(left: 3, right: 3),
+        ),
+        'td': Style(
+          padding: HtmlPaddings.all(4.0),
+          alignment: Alignment.center,
+          textAlign: TextAlign.center,
+        ),
       },
     );
   }

lib/common/widgets/video_card_h.dart

@@ -7,6 +7,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/http/user.dart';
+import 'package:pilipala/pages/member/index.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 
@@ -33,9 +34,10 @@ class VideoCardH extends StatelessWidget {
     String heroTag = Utils.makeHeroTag(aid);
     return GestureDetector(
       onLongPress: () {
-        if (longPress != null) {
-          longPress!();
-        }
+        // if (longPress != null) {
+        //   longPress!();
+        // }
+        MemberController().blockUser(videoItem.mid);
       },
       // onLongPressEnd: (details) {
       //   if (longPressEnd != null) {
@@ -188,46 +190,7 @@ class VideoContent extends StatelessWidget {
                     color: Theme.of(context).colorScheme.outline,
                   ),
                 ),
-              ],
-            ),
-            Row(
-              children: [
-                StatView(
-                  theme: 'gray',
-                  view: videoItem.stat.view,
-                ),
-                const SizedBox(width: 8),
-                StatDanMu(
-                  theme: 'gray',
-                  danmu: videoItem.stat.danmaku,
-                ),
-                // Text(
-                //   Utils.dateFormat(videoItem.pubdate!),
-                //   style: TextStyle(
-                //       fontSize: 11,
-                //       color: Theme.of(context).colorScheme.outline),
-                // )
                 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,
@@ -261,6 +224,20 @@ class VideoContent extends StatelessWidget {
                             ],
                           ),
                         ),
+                        // PopupMenuItem<String>(
+                        //   onTap: () async {
+                        //     MemberController().blockUser(videoItem.mid);
+                        //   },
+                        //   value: 'block',
+                        //   height: 35,
+                        //   child: const Row(
+                        //     children: [
+                        //       Icon(Icons.block, size: 16),
+                        //       SizedBox(width: 6),
+                        //       Text('拉黑up', style: TextStyle(fontSize: 13))
+                        //     ],
+                        //   ),
+                        // ),
                       ],
                     ),
                   ),

lib/common/widgets/video_card_v.dart

@@ -5,7 +5,6 @@ import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
-import 'package:pilipala/http/dynamics.dart';
 import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -28,11 +27,6 @@ class VideoCardV extends StatelessWidget {
     this.longPressEnd,
   }) : super(key: key);
 
-  bool isStringNumeric(String str) {
-    RegExp numericRegex = RegExp(r'^\d+$');
-    return numericRegex.hasMatch(str);
-  }
-
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
     switch (goto) {
@@ -54,7 +48,7 @@ class VideoCardV extends StatelessWidget {
               arguments: {
                 'pic': videoItem.pic,
                 'heroTag': heroTag,
-                'videoType': SearchType.media_bangumi,
+                // 'videoType': SearchType.media_bangumi,
               },
             ),
           );
@@ -68,47 +62,6 @@ class VideoCardV extends StatelessWidget {
           'heroTag': heroTag,
         });
         break;
-      // 动态
-      case 'picture':
-        try {
-          String dynamicType = 'picture';
-          String uri = videoItem.uri;
-          String id = '';
-          if (videoItem.uri.startsWith('bilibili://article/')) {
-            // https://www.bilibili.com/read/cv27063554
-            dynamicType = 'read';
-            RegExp regex = RegExp(r'\d+');
-            Match match = regex.firstMatch(videoItem.uri)!;
-            String matchedNumber = match.group(0)!;
-            videoItem.param = int.parse(matchedNumber);
-            id = 'cv${videoItem.param}';
-          }
-          if (uri.startsWith('http')) {
-            String path = Uri.parse(uri).path;
-            if (isStringNumeric(path.split('/')[1])) {
-              // 请求接口
-              var res =
-                  await DynamicsHttp.dynamicDetail(id: path.split('/')[1]);
-              if (res['status']) {
-                Get.toNamed('/dynamicDetail', arguments: {
-                  'item': res['data'],
-                  'floor': 1,
-                  'action': 'detail'
-                });
-              }
-              return;
-            }
-          }
-          Get.toNamed('/htmlRender', parameters: {
-            'url': uri,
-            'title': videoItem.title,
-            'id': id,
-            'dynamicType': dynamicType
-          });
-        } catch (err) {
-          SmartDialog.showToast(err.toString());
-        }
-        break;
       default:
         SmartDialog.showToast(videoItem.goto);
         Get.toNamed(
@@ -325,18 +278,23 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return RichText(
-      maxLines: 1,
-      text: TextSpan(
-        style: TextStyle(
-          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-          color: Theme.of(context).colorScheme.outline,
+    return Row(
+      children: [
+        Text(
+          '${videoItem.stat.view}观看',
+          style: TextStyle(
+            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+            color: Theme.of(context).colorScheme.outline,
+          ),
         ),
-        children: [
-          TextSpan(text: '${videoItem.stat.view}观看'),
-          TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
-        ],
-      ),
+        Text(
+          ' • ${videoItem.stat.danmu}弹幕',
+          style: TextStyle(
+            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+            color: Theme.of(context).colorScheme.outline,
+          ),
+        ),
+      ],
     );
   }
 }

lib/http/api.dart

@@ -97,9 +97,6 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
-  // 相互关系查询
-  static const String relationSearch = '/x/space/wbi/acc/relation';
-
   // 评论列表
   // https://api.bilibili.com/x/v2/reply/main?csrf=6e22efc1a47225ea25f901f922b5cfdd&mode=3&oid=254175381&pagination_str=%7B%22offset%22:%22%22%7D&plat=1&seek_rpid=0&type=11
   static const String replyList = '/x/v2/reply';
@@ -129,14 +126,12 @@ class Api {
   static const String userFavFolder = '/x/v3/fav/folder/created/list';
 
   /// 收藏夹 详情
-  /// media_id  当前收藏夹id 搜索全部时为默认收藏夹id
+  /// media_id int 收藏夹id
   /// pn int 当前页
   /// ps int pageSize
   /// keyword String 搜索词
   /// order String 排序方式 view 最多播放 mtime 最近收藏 pubtime 最近投稿
   /// tid int 分区id
-  /// platform web
-  /// type 0 当前收藏夹 1 全部收藏夹
   // https://api.bilibili.com/x/v3/fav/resource/list?media_id=76614671&pn=1&ps=20&keyword=&order=mtime&type=0&tid=0
   static const String userFavFolderDetail = '/x/v3/fav/resource/list';
 
@@ -172,9 +167,6 @@ class Api {
   // 删除某条历史记录
   static const String delHistory = '/x/v2/history/delete';
 
-  // 搜索历史记录
-  static const String searchHistory = '/x/web-goblin/history/search';
-
   // 热搜
   static const String hotSearchList =
       'https://s.search.bilibili.com/main/hotword';
@@ -312,64 +304,6 @@ class Api {
 
   static const String webDanmaku = '/x/v2/dm/web/seg.so';
 
-  // up主分组
-  static const String followUpTag = '/x/relation/tags';
-
-  // 设置Up主分组
-  // 0 添加至默认分组  否则使用,分割tagid
-  static const String addUsers = '/x/relation/tags/addUsers';
-
-  // 获取指定分组下的up
-  static const String followUpGroup = '/x/relation/tag';
-
-  // 获取某个动态详情
-  // timezone_offset=-480
-  // id=849312409672744983
-  // features=itemOpusStyle
-  static const String dynamicDetail = '/x/polymer/web-dynamic/v1/detail';
-
-  // AI总结
-  /// https://api.bilibili.com/x/web-interface/view/conclusion/get?
-  /// bvid=BV1ju4y1s7kn&
-  /// cid=1296086601&
-  /// up_mid=4641697&
-  /// w_rid=1607c6c5a4a35a1297e31992220900ae&
-  /// wts=1697033079
-  static const String aiConclusion = '/x/web-interface/view/conclusion/get';
-
-  // captcha验证码
-  static const String getCaptcha =
-      'https://passport.bilibili.com/x/passport-login/captcha?source=main_web';
-
-  // web端短信验证码
-  static const String smsCode =
-      'https://passport.bilibili.com/x/passport-login/web/sms/send';
-
-  // web端验证码登录
-
-  // web端密码登录
-
-  // app端短信验证码
-  static const String appSmsCode =
-      'https://passport.bilibili.com/x/passport-login/sms/send';
-
-  // app端验证码登录
-
-  // 获取短信验证码
-  // static const String appSafeSmsCode =
-  //     'https://passport.bilibili.com/x/safecenter/common/sms/send';
-
-  /// app端密码登录
-  /// username
-  /// password
-  /// key
-  /// rhash
-  static const String loginInByPwdApi =
-      'https://passport.bilibili.com/x/passport-login/oauth2/login';
-
-  /// 密码加密密钥
-  /// disable_rcmd
-  /// local_id
-  static const getWebKey =
-      'https://passport.bilibili.com/x/passport-login/web/key';
+  // 搜索历史记录
+  static const String searchHistory = '/x/web-goblin/history/search';
 }

lib/http/constants.dart

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

lib/http/danmaku.dart

@@ -17,11 +17,17 @@ class DanmakaHttp {
       'oid': cid,
       'segment_index': segmentIndex,
     };
-    var response = await Request().get(
-      Api.webDanmaku,
-      data: params,
-      extra: {'resType': ResponseType.bytes},
-    );
-    return DmSegMobileReply.fromBuffer(response.data);
+
+    // 计算函数
+    Future<DmSegMobileReply> computeTask(Map<String, int> params) async {
+      var response = await Request().get(
+        Api.webDanmaku,
+        data: params,
+        extra: {'resType': ResponseType.bytes},
+      );
+      return DmSegMobileReply.fromBuffer(response.data);
+    }
+
+    return await compute(computeTask, params);
   }
 }

lib/http/dynamics.dart

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

lib/http/html.dart

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

lib/http/init.dart

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

lib/http/interceptor.dart

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

lib/http/login.dart

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

lib/http/member.dart

@@ -1,9 +1,7 @@
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/models/member/info.dart';
-import 'package:pilipala/models/member/tags.dart';
 import 'package:pilipala/utils/wbi_sign.dart';
 
 class MemberHttp {
@@ -20,7 +18,6 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberInfo,
       data: params,
-      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -86,7 +83,6 @@ class MemberHttp {
     var res = await Request().get(
       Api.memberArchive,
       data: params,
-      extra: {'ua': 'pc'},
     );
     if (res.data['code'] == 0) {
       return {
@@ -146,73 +142,4 @@ class MemberHttp {
       };
     }
   }
-
-  // 查询分组
-  static Future followUpTags() async {
-    var res = await Request().get(Api.followUpTag);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data']
-            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
-            .toList()
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
-
-  // 设置分组
-  static Future addUsers(int? fids, String? tagids) async {
-    var res = await Request().post(Api.addUsers, queryParameters: {
-      'fids': fids,
-      'tagids': tagids ?? '0',
-      'csrf': await Request.getCsrf(),
-    }, data: {
-      'cross_domain': true
-    });
-    if (res.data['code'] == 0) {
-      return {'status': true, 'data': [], 'msg': '操作成功'};
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
-
-  // 获取某分组下的up
-  static Future followUpGroup(
-    int? mid,
-    int? tagid,
-    int? pn,
-    int? ps,
-  ) async {
-    var res = await Request().get(Api.followUpGroup, data: {
-      'mid': mid,
-      'tagid': tagid,
-      'pn': pn,
-      'ps': ps,
-    });
-    if (res.data['code'] == 0) {
-      // FollowItemModel
-      return {
-        'status': true,
-        'data': res.data['data']
-            .map<FollowItemModel>((e) => FollowItemModel.fromJson(e))
-            .toList()
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/reply.dart

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

lib/http/user.dart

@@ -8,7 +8,6 @@ import 'package:pilipala/models/user/fav_folder.dart';
 import 'package:pilipala/models/user/history.dart';
 import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/user/stat.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
 
 class UserHttp {
   static Future<dynamic> userStat({required int mid}) async {
@@ -71,15 +70,14 @@ class UserHttp {
       required int pn,
       required int ps,
       String keyword = '',
-      String order = 'mtime',
-      int type = 0}) async {
+      String order = 'mtime'}) async {
     var res = await Request().get(Api.userFavFolderDetail, data: {
       'media_id': mediaId,
       'pn': pn,
       'ps': ps,
       'keyword': keyword,
       'order': order,
-      'type': type,
+      'type': 0,
       'tid': 0,
       'platform': 'web'
     });
@@ -251,31 +249,6 @@ class UserHttp {
     }
   }
 
-  // 相互关系查询
-  static Future relationSearch(int mid) async {
-    Map params = await WbiSign().makSign({
-      'mid': mid,
-      'token': '',
-      'platform': 'web',
-      'web_location': 1550101,
-    });
-    var res = await Request().get(
-      Api.relationSearch,
-      data: {
-        'mid': mid,
-        'w_rid': params['w_rid'],
-        'wts': params['wts'],
-      },
-    );
-    if (res.data['code'] == 0) {
-      // relation 主动状态
-      // 被动状态
-      return {'status': true, 'data': res.data['data']};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
-
   // 搜索历史记录
   static Future searchHistory(
       {required int pn, required String keyword}) async {

lib/http/video.dart

@@ -9,11 +9,9 @@ import 'package:pilipala/models/home/rcmd/result.dart';
 import 'package:pilipala/models/model_hot_video_item.dart';
 import 'package:pilipala/models/model_rec_video_item.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
-import 'package:pilipala/models/video/ai.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/utils/wbi_sign.dart';
 
 /// res.data['code'] == 0 请求正常返回结果
 /// res.data['data'] 为结果
@@ -24,7 +22,6 @@ class VideoHttp {
   static Box setting = GStrorage.setting;
   static bool enableRcmdDynamic =
       setting.get(SettingBoxKey.enableRcmdDynamic, defaultValue: true);
-  static Box userInfoCache = GStrorage.userInfo;
 
   // 首页推荐视频
   static Future rcmdVideoList({required int ps, required int freshIdx}) async {
@@ -136,11 +133,6 @@ class VideoHttp {
       // 'platform': '',
       // 'high_quality': ''
     };
-    // 免登录查看1080p
-    if (userInfoCache.get('userInfoCache') == null &&
-        setting.get(SettingBoxKey.p1080, defaultValue: true)) {
-      data['try_look'] = 1;
-    }
     try {
       var res = await Request().get(Api.videoUrl, data: data);
       if (res.data['code'] == 0) {
@@ -422,23 +414,4 @@ class VideoHttp {
       return {'status': true, 'data': res.data['data']};
     }
   }
-
-  static Future aiConclusion({
-    String? bvid,
-    int? cid,
-    int? upMid,
-  }) async {
-    Map params = await WbiSign().makSign({
-      'bvid': bvid,
-      'cid': cid,
-      'up_mid': upMid,
-    });
-    var res = await Request().get(Api.aiConclusion, data: params);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': AiConclusionModel.fromJson(res.data['data']),
-      };
-    }
-  }
 }

lib/main.dart

@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-import 'package:audio_service/audio_service.dart';
-=======
-import 'dart:io';
-
->>>>>>> main
 import 'package:flutter/services.dart';
-import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -20,7 +13,6 @@ import 'package:pilipala/pages/search/index.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/router/app_pages.dart';
 import 'package:pilipala/pages/main/view.dart';
-import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -33,22 +25,6 @@ void main() async {
           [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown])
       .then((_) async {
     await GStrorage.init();
-<<<<<<< HEAD
-
-    await AudioService.init<AudioHandler>(
-      builder: () => MyAudioHandler(),
-      config: const AudioServiceConfig(
-        androidNotificationChannelId: 'com.guozhigq.pilipala.channel.audio',
-        androidNotificationChannelName: 'Music playback',
-        androidNotificationOngoing: true,
-        androidStopForegroundOnPause: true,
-        androidNotificationIcon: 'drawable/audio_service_icon',
-      ),
-    );
-
-=======
-    await setupServiceLocator();
->>>>>>> main
     runApp(const MyApp());
     // 小白条、导航栏沉浸
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
@@ -85,23 +61,6 @@ class MyApp extends StatelessWidget {
     double textScale =
         setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
 
-    // 强制设置高帧率
-    if (Platform.isAndroid) {
-      try {
-        late List modes;
-        FlutterDisplayMode.supported.then((value) {
-          modes = value;
-          var storageDisplay = setting.get(SettingBoxKey.displayMode);
-          DisplayMode f = DisplayMode.auto;
-          if (storageDisplay != null) {
-            f = modes.firstWhere((e) => e.toString() == storageDisplay);
-          }
-          DisplayMode preferred = modes.toList().firstWhere((el) => el == f);
-          FlutterDisplayMode.setPreferredMode(preferred);
-        });
-      } catch (_) {}
-    }
-
     return DynamicColorBuilder(
       builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
         ColorScheme? lightColorScheme;
@@ -176,34 +135,3 @@ class MyApp extends StatelessWidget {
     );
   }
 }
-
-class MyAudioHandler extends BaseAudioHandler
-    with
-        QueueHandler, // mix in default queue callback implementations
-        SeekHandler {
-  // mix in default seek callback implementations
-
-  // The most common callbacks:
-  @override
-  Future<void> play() async {
-    print('play');
-    // All 'play' requests from all origins route to here. Implement this
-    // callback to start playing audio appropriate to your app. e.g. music.
-  }
-
-  ///
-  @override
-  Future<void> pause() async {}
-
-  ///
-  @override
-  Future<void> stop() async {}
-
-  ///
-  @override
-  Future<void> seek(Duration position) async {}
-
-  ///
-  @override
-  Future<void> skipToQueueItem(int i) async {}
-}

lib/models/dynamics/result.dart

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

lib/models/follow/result.dart

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

lib/models/login/index.dart

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

lib/models/member/tags.dart

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

lib/models/video/ai.dart

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

lib/pages/about/index.dart

@@ -184,7 +184,7 @@ class AboutController extends GetxController {
 
   // 获取远程版本
   Future getRemoteApp() async {
-    var result = await Request().get(Api.latestApp, extra: {'ua': 'pc'});
+    var result = await Request().get(Api.latestApp);
     data = LatestDataModel.fromJson(result.data);
     remoteAppInfo = data;
     remoteVersion.value = data.tagName!;

lib/pages/audio/index.dart

@@ -1,4 +0,0 @@
-library pl_audio_player;
-
-export './view.dart';
-export './controller.dart';

lib/pages/audio/view.dart

@@ -1,539 +0,0 @@
-import 'dart:math';
-
-import 'package:audio_service/audio_service.dart';
-import 'package:audio_session/audio_session.dart';
-import 'package:flutter/material.dart';
-import 'package:just_audio/just_audio.dart';
-// import 'package:just_audio_background/just_audio_background.dart';
-
-class AudioPlayerPage extends StatefulWidget {
-  const AudioPlayerPage({super.key});
-
-  @override
-  State<AudioPlayerPage> createState() => _AudioPlayerPageState();
-}
-
-class _AudioPlayerPageState extends State<AudioPlayerPage> {
-  static int _nextMediaId = 0;
-  late AudioPlayer _player;
-  final _playlist = ConcatenatingAudioSource(children: [
-    ClippingAudioSource(
-      start: const Duration(seconds: 0),
-      end: const Duration(seconds: 90),
-      child: AudioSource.uri(Uri.parse(
-          "https://s3.amazonaws.com/scifri-episodes/scifri20181123-episode.mp3")),
-      tag: MediaItem(
-        id: '${_nextMediaId++}',
-        album: "Science Friday",
-        title: "A Salute To Head-Scratching Science (30 seconds)",
-        artUri: Uri.parse(
-            "https://media.wnyc.org/i/1400/1400/l/80/1/ScienceFriday_WNYCStudios_1400.jpg"),
-      ),
-    ),
-    // AudioSource.uri(
-    //   Uri.parse(
-    //       "https://upos-sz-mirror08c.bilivideo.com/upgcxcode/05/52/1205825205/1205825205-1-16.mp4?e=ig8euxZM2rNcNbRVhwdVhwdlhWdVhwdVhoNvNC8BqJIzNbfq9rVEuxTEnE8L5F6VnEsSTx0vkX8fqJeYTj_lta53NCM=&uipk=5&nbs=1&deadline=1693821903&gen=playurlv2&os=08cbv&oi=1865700872&trid=bfc9c19f85c545dd8f4794ff97f4f57fh&mid=17340771&platform=html5&upsig=9bf98515091bb8a80e1950a03a2a0d68&uparams=e,uipk,nbs,deadline,gen,os,oi,trid,mid,platform&bvc=vod&nettype=0&f=h_0_0&bw=49663&logo=80000000"),
-    //   headers: {
-    //     'user-agent':
-    //         'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15',
-    //     'referer': 'https://www.bilibili.com'
-    //   },
-    //   tag: MediaItem(
-    //     id: '${_nextMediaId++}',
-    //     album: "Science Friday",
-    //     title: "A Salute To Head-Scratching Science",
-    //     artUri: Uri.parse(
-    //         "https://media.wnyc.org/i/1400/1400/l/80/1/ScienceFriday_WNYCStudios_1400.jpg"),
-    //   ),
-    // ),
-    AudioSource.uri(
-      Uri.parse("https://s3.amazonaws.com/scifri-segments/scifri201711241.mp3"),
-      tag: MediaItem(
-        id: '${_nextMediaId++}',
-        album: "Science Friday",
-        title: "From Cat Rheology To Operatic Incompetence",
-        artUri: Uri.parse(
-            "https://media.wnyc.org/i/1400/1400/l/80/1/ScienceFriday_WNYCStudios_1400.jpg"),
-      ),
-    ),
-    AudioSource.uri(
-      Uri.parse("asset:///audio/nature.mp3"),
-      tag: MediaItem(
-        id: '${_nextMediaId++}',
-        album: "Public Domain",
-        title: "Nature Sounds",
-        artUri: Uri.parse(
-            "https://media.wnyc.org/i/1400/1400/l/80/1/ScienceFriday_WNYCStudios_1400.jpg"),
-      ),
-    ),
-  ]);
-
-  @override
-  void initState() {
-    super.initState();
-    _player = AudioPlayer();
-
-    _init();
-  }
-
-  @override
-  void dispose() {
-    _player.dispose();
-    super.dispose();
-  }
-
-  Future<void> _init() async {
-    final session = await AudioSession.instance;
-    await session.configure(const AudioSessionConfiguration.speech());
-    // Listen to errors during playback.
-    _player.playbackEventStream.listen((event) {},
-        onError: (Object e, StackTrace stackTrace) {
-      print('A stream error occurred: $e');
-    });
-    try {
-      await _player.setAudioSource(_playlist);
-    } catch (e, stackTrace) {
-      // Catch load errors: 404, invalid url ...
-      print("Error loading playlist: $e");
-      print(stackTrace);
-    }
-  }
-
-  // Stream<PositionData> get _positionDataStream =>
-  //     Rx.combineLatest3<Duration, Duration, Duration?, PositionData>(
-  //         _player.positionStream,
-  //         _player.bufferedPositionStream,
-  //         _player.durationStream,
-  //         (position, bufferedPosition, duration) => PositionData(
-  //             position, bufferedPosition, duration ?? Duration.zero));
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SafeArea(
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Expanded(
-              child: StreamBuilder<SequenceState?>(
-                stream: _player.sequenceStateStream,
-                builder: (context, snapshot) {
-                  final state = snapshot.data;
-                  if (state?.sequence.isEmpty ?? true) {
-                    return const SizedBox();
-                  }
-                  final metadata = state!.currentSource!.tag as MediaItem;
-                  return Column(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Expanded(
-                        child: Padding(
-                          padding: const EdgeInsets.all(8.0),
-                          child: Center(
-                              child: Image.network(metadata.artUri.toString())),
-                        ),
-                      ),
-                      Text(metadata.album!,
-                          style: Theme.of(context).textTheme.titleLarge),
-                      Text(metadata.title),
-                    ],
-                  );
-                },
-              ),
-            ),
-            ControlButtons(_player),
-            // StreamBuilder<PositionData>(
-            //   stream: _positionDataStream,
-            //   builder: (context, snapshot) {
-            //     final positionData = snapshot.data;
-            //     return SeekBar(
-            //       duration: positionData?.duration ?? Duration.zero,
-            //       position: positionData?.position ?? Duration.zero,
-            //       bufferedPosition:
-            //           positionData?.bufferedPosition ?? Duration.zero,
-            //       onChangeEnd: (newPosition) {
-            //         _player.seek(newPosition);
-            //       },
-            //     );
-            //   },
-            // ),
-            const SizedBox(height: 8.0),
-            Row(
-              children: [
-                StreamBuilder<LoopMode>(
-                  stream: _player.loopModeStream,
-                  builder: (context, snapshot) {
-                    final loopMode = snapshot.data ?? LoopMode.off;
-                    const icons = [
-                      Icon(Icons.repeat, color: Colors.grey),
-                      Icon(Icons.repeat, color: Colors.orange),
-                      Icon(Icons.repeat_one, color: Colors.orange),
-                    ];
-                    const cycleModes = [
-                      LoopMode.off,
-                      LoopMode.all,
-                      LoopMode.one,
-                    ];
-                    final index = cycleModes.indexOf(loopMode);
-                    return IconButton(
-                      icon: icons[index],
-                      onPressed: () {
-                        _player.setLoopMode(cycleModes[
-                            (cycleModes.indexOf(loopMode) + 1) %
-                                cycleModes.length]);
-                      },
-                    );
-                  },
-                ),
-                Expanded(
-                  child: Text(
-                    "Playlist",
-                    style: Theme.of(context).textTheme.titleLarge,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-                StreamBuilder<bool>(
-                  stream: _player.shuffleModeEnabledStream,
-                  builder: (context, snapshot) {
-                    final shuffleModeEnabled = snapshot.data ?? false;
-                    return IconButton(
-                      icon: shuffleModeEnabled
-                          ? const Icon(Icons.shuffle, color: Colors.orange)
-                          : const Icon(Icons.shuffle, color: Colors.grey),
-                      onPressed: () async {
-                        final enable = !shuffleModeEnabled;
-                        if (enable) {
-                          await _player.shuffle();
-                        }
-                        await _player.setShuffleModeEnabled(enable);
-                      },
-                    );
-                  },
-                ),
-              ],
-            ),
-            SizedBox(
-              height: 240.0,
-              child: StreamBuilder<SequenceState?>(
-                stream: _player.sequenceStateStream,
-                builder: (context, snapshot) {
-                  final state = snapshot.data;
-                  final sequence = state?.sequence ?? [];
-                  return ReorderableListView(
-                    onReorder: (int oldIndex, int newIndex) {
-                      if (oldIndex < newIndex) newIndex--;
-                      _playlist.move(oldIndex, newIndex);
-                    },
-                    children: [
-                      for (var i = 0; i < sequence.length; i++)
-                        Dismissible(
-                          key: ValueKey(sequence[i]),
-                          background: Container(
-                            color: Colors.redAccent,
-                            alignment: Alignment.centerRight,
-                            child: const Padding(
-                              padding: EdgeInsets.only(right: 8.0),
-                              child: Icon(Icons.delete, color: Colors.white),
-                            ),
-                          ),
-                          onDismissed: (dismissDirection) {
-                            _playlist.removeAt(i);
-                          },
-                          child: Material(
-                            color: i == state!.currentIndex
-                                ? Colors.grey.shade300
-                                : null,
-                            child: ListTile(
-                              title: Text(sequence[i].tag.title as String),
-                              onTap: () {
-                                _player.seek(Duration.zero, index: i);
-                              },
-                            ),
-                          ),
-                        ),
-                    ],
-                  );
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class ControlButtons extends StatelessWidget {
-  final AudioPlayer player;
-
-  const ControlButtons(this.player, {Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        IconButton(
-          icon: const Icon(Icons.volume_up),
-          onPressed: () {
-            showSliderDialog(
-              context: context,
-              title: "Adjust volume",
-              divisions: 10,
-              min: 0.0,
-              max: 1.0,
-              stream: player.volumeStream,
-              onChanged: player.setVolume,
-            );
-          },
-        ),
-        StreamBuilder<SequenceState?>(
-          stream: player.sequenceStateStream,
-          builder: (context, snapshot) => IconButton(
-            icon: const Icon(Icons.skip_previous),
-            onPressed: player.hasPrevious ? player.seekToPrevious : null,
-          ),
-        ),
-        StreamBuilder<PlayerState>(
-          stream: player.playerStateStream,
-          builder: (context, snapshot) {
-            final playerState = snapshot.data;
-            final processingState = playerState?.processingState;
-            final playing = playerState?.playing;
-            if (processingState == ProcessingState.loading ||
-                processingState == ProcessingState.buffering) {
-              return Container(
-                margin: const EdgeInsets.all(8.0),
-                width: 64.0,
-                height: 64.0,
-                child: const CircularProgressIndicator(),
-              );
-            } else if (playing != true) {
-              return IconButton(
-                icon: const Icon(Icons.play_arrow),
-                iconSize: 64.0,
-                onPressed: player.play,
-              );
-            } else if (processingState != ProcessingState.completed) {
-              return IconButton(
-                icon: const Icon(Icons.pause),
-                iconSize: 64.0,
-                onPressed: player.pause,
-              );
-            } else {
-              return IconButton(
-                icon: const Icon(Icons.replay),
-                iconSize: 64.0,
-                onPressed: () => player.seek(Duration.zero,
-                    index: player.effectiveIndices!.first),
-              );
-            }
-          },
-        ),
-        StreamBuilder<SequenceState?>(
-          stream: player.sequenceStateStream,
-          builder: (context, snapshot) => IconButton(
-            icon: const Icon(Icons.skip_next),
-            onPressed: player.hasNext ? player.seekToNext : null,
-          ),
-        ),
-        StreamBuilder<double>(
-          stream: player.speedStream,
-          builder: (context, snapshot) => IconButton(
-            icon: Text("${snapshot.data?.toStringAsFixed(1)}x",
-                style: const TextStyle(fontWeight: FontWeight.bold)),
-            onPressed: () {
-              showSliderDialog(
-                context: context,
-                title: "Adjust speed",
-                divisions: 10,
-                min: 0.5,
-                max: 1.5,
-                stream: player.speedStream,
-                onChanged: player.setSpeed,
-              );
-            },
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-void showSliderDialog({
-  required BuildContext context,
-  required String title,
-  required int divisions,
-  required double min,
-  required double max,
-  String valueSuffix = '',
-  required Stream<double> stream,
-  required ValueChanged<double> onChanged,
-}) {
-  showDialog<void>(
-    context: context,
-    builder: (context) => AlertDialog(
-      title: Text(title, textAlign: TextAlign.center),
-      content: StreamBuilder<double>(
-        stream: stream,
-        builder: (context, snapshot) => SizedBox(
-          height: 100.0,
-          child: Column(
-            children: [
-              Text('${snapshot.data?.toStringAsFixed(1)}$valueSuffix',
-                  style: const TextStyle(
-                      fontFamily: 'Fixed',
-                      fontWeight: FontWeight.bold,
-                      fontSize: 24.0)),
-              Slider(
-                divisions: divisions,
-                min: min,
-                max: max,
-                value: snapshot.data ?? 1.0,
-                onChanged: onChanged,
-              ),
-            ],
-          ),
-        ),
-      ),
-    ),
-  );
-}
-
-class PositionData {
-  final Duration position;
-  final Duration bufferedPosition;
-  final Duration duration;
-
-  PositionData(this.position, this.bufferedPosition, this.duration);
-}
-
-class SeekBar extends StatefulWidget {
-  final Duration duration;
-  final Duration position;
-  final Duration bufferedPosition;
-  final ValueChanged<Duration>? onChanged;
-  final ValueChanged<Duration>? onChangeEnd;
-
-  const SeekBar({
-    Key? key,
-    required this.duration,
-    required this.position,
-    required this.bufferedPosition,
-    this.onChanged,
-    this.onChangeEnd,
-  }) : super(key: key);
-
-  @override
-  SeekBarState createState() => SeekBarState();
-}
-
-class SeekBarState extends State<SeekBar> {
-  double? _dragValue;
-  late SliderThemeData _sliderThemeData;
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-
-    _sliderThemeData = SliderTheme.of(context).copyWith(
-      trackHeight: 2.0,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        SliderTheme(
-          data: _sliderThemeData.copyWith(
-            thumbShape: HiddenThumbComponentShape(),
-            activeTrackColor: Colors.blue.shade100,
-            inactiveTrackColor: Colors.grey.shade300,
-          ),
-          child: ExcludeSemantics(
-            child: Slider(
-              min: 0.0,
-              max: widget.duration.inMilliseconds.toDouble(),
-              value: min(widget.bufferedPosition.inMilliseconds.toDouble(),
-                  widget.duration.inMilliseconds.toDouble()),
-              onChanged: (value) {
-                setState(() {
-                  _dragValue = value;
-                });
-                if (widget.onChanged != null) {
-                  widget.onChanged!(Duration(milliseconds: value.round()));
-                }
-              },
-              onChangeEnd: (value) {
-                if (widget.onChangeEnd != null) {
-                  widget.onChangeEnd!(Duration(milliseconds: value.round()));
-                }
-                _dragValue = null;
-              },
-            ),
-          ),
-        ),
-        SliderTheme(
-          data: _sliderThemeData.copyWith(
-            inactiveTrackColor: Colors.transparent,
-          ),
-          child: Slider(
-            min: 0.0,
-            max: widget.duration.inMilliseconds.toDouble(),
-            value: min(_dragValue ?? widget.position.inMilliseconds.toDouble(),
-                widget.duration.inMilliseconds.toDouble()),
-            onChanged: (value) {
-              setState(() {
-                _dragValue = value;
-              });
-              if (widget.onChanged != null) {
-                widget.onChanged!(Duration(milliseconds: value.round()));
-              }
-            },
-            onChangeEnd: (value) {
-              if (widget.onChangeEnd != null) {
-                widget.onChangeEnd!(Duration(milliseconds: value.round()));
-              }
-              _dragValue = null;
-            },
-          ),
-        ),
-        Positioned(
-          right: 16.0,
-          bottom: 0.0,
-          child: Text(
-              RegExp(r'((^0*[1-9]\d*:)?\d{2}:\d{2})\.\d+$')
-                      .firstMatch("$_remaining")
-                      ?.group(1) ??
-                  '$_remaining',
-              style: Theme.of(context).textTheme.bodySmall),
-        ),
-      ],
-    );
-  }
-
-  Duration get _remaining => widget.duration - widget.position;
-}
-
-class HiddenThumbComponentShape extends SliderComponentShape {
-  @override
-  Size getPreferredSize(bool isEnabled, bool isDiscrete) => Size.zero;
-
-  @override
-  void paint(
-    PaintingContext context,
-    Offset center, {
-    required Animation<double> activationAnimation,
-    required Animation<double> enableAnimation,
-    required bool isDiscrete,
-    required TextPainter labelPainter,
-    required RenderBox parentBox,
-    required SliderThemeData sliderTheme,
-    required TextDirection textDirection,
-    required double value,
-    required double textScaleFactor,
-    required Size sizeWithOverflow,
-  }) {}
-}

lib/pages/bangumi/introduction/controller.dart

@@ -22,7 +22,7 @@ class BangumiIntroController extends GetxController {
       ? int.parse(Get.parameters['seasonId']!)
       : null;
   var epId = Get.parameters['epId'] != null
-      ? int.tryParse(Get.parameters['epId']!)
+      ? int.parse(Get.parameters['epId']!)
       : null;
 
   // 是否预渲染 骨架屏
@@ -258,7 +258,7 @@ class BangumiIntroController extends GetxController {
     VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
     videoDetailCtr.bvid = bvid;
-    videoDetailCtr.cid.value = cid;
+    videoDetailCtr.cid = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
     // 重新请求评论

lib/pages/bangumi/introduction/view.dart

@@ -34,12 +34,10 @@ class BangumiIntroPanel extends StatefulWidget {
 
 class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     with AutomaticKeepAliveClientMixin {
-  late BangumiIntroController bangumiIntroController;
-  late VideoDetailController videoDetailCtr;
+  final BangumiIntroController bangumiIntroController =
+      Get.put(BangumiIntroController(), tag: Get.arguments['heroTag']);
   BangumiInfoModel? bangumiDetail;
   late Future _futureBuilderFuture;
-  late int cid;
-  late String heroTag;
 
 // 添加页面缓存
   @override
@@ -48,19 +46,10 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
   @override
   void initState() {
     super.initState();
-    heroTag = Get.arguments['heroTag'];
-    cid = widget.cid!;
-    bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
-    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
       bangumiDetail = value;
     });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
-    videoDetailCtr.cid.listen((p0) {
-      print('🐶🐶$p0');
-      cid = p0;
-      setState(() {});
-    });
   }
 
   @override
@@ -72,25 +61,22 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
         if (snapshot.connectionState == ConnectionState.done) {
           if (snapshot.data['status']) {
             // 请求成功
-
             return BangumiInfo(
               loadingStatus: false,
               bangumiDetail: bangumiDetail,
-              cid: cid,
             );
           } else {
             // 请求错误
-            // return HttpError(
-            //   errMsg: snapshot.data['msg'],
-            //   fn: () => Get.back(),
-            // );
-            return SizedBox();
+            return HttpError(
+              errMsg: snapshot.data['msg'],
+              fn: () => Get.back(),
+            );
           }
         } else {
           return BangumiInfo(
             loadingStatus: true,
             bangumiDetail: bangumiDetail,
-            cid: cid,
+            cid: widget.cid,
           );
         }
       },
@@ -131,12 +117,6 @@ class _BangumiInfoState extends State<BangumiInfo> {
     bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
-    print('cid:  $cid');
-    videoDetailCtr.cid.listen((p0) {
-      cid = p0;
-      print('cid:  $cid');
-      setState(() {});
-    });
   }
 
   // 收藏
@@ -280,15 +260,9 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     Text(
                                       !widget.loadingStatus
-                                          ? (widget.bangumiDetail!.areas!
-                                                  .isNotEmpty
-                                              ? widget.bangumiDetail!.areas!
-                                                  .first['name']
-                                              : '')
-                                          : (bangumiItem!.areas!.isNotEmpty
-                                              ? bangumiItem!
-                                                  .areas!.first['name']
-                                              : ''),
+                                          ? widget.bangumiDetail!.areas!
+                                              .first['name']
+                                          : bangumiItem!.areas!.first['name'],
                                       style: TextStyle(
                                         fontSize: 12,
                                         color: t.colorScheme.outline,

lib/pages/bangumi/view.dart

@@ -201,7 +201,7 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
-          LoadingMore()
+          const LoadingMore()
         ],
       ),
     );

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/bangumi/info.dart';
-import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class BangumiPanel extends StatefulWidget {
@@ -32,28 +30,16 @@ class _BangumiPanelState extends State<BangumiPanel> {
   dynamic userInfo;
   // 默认未开通
   int vipStatus = 0;
-  late int cid;
-  String heroTag = Get.arguments['heroTag'];
-  late final VideoDetailController videoDetailCtr;
 
   @override
   void initState() {
     super.initState();
-    cid = widget.cid!;
-    currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
+    currentIndex = widget.pages.indexWhere((e) => e.cid == widget.cid!);
     scrollToIndex();
     userInfo = userInfoCache.get('userInfoCache');
     if (userInfo != null) {
       vipStatus = userInfo.vipStatus;
     }
-    videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-
-    videoDetailCtr.cid.listen((p0) {
-      cid = p0;
-      setState(() {});
-      currentIndex = widget.pages.indexWhere((e) => e.cid == cid);
-      scrollToIndex();
-    });
   }
 
   @override

lib/pages/bangumi/widgets/bangumu_card_v.dart

@@ -62,7 +62,7 @@ class BangumiCardV extends StatelessWidget {
                   arguments: {
                     'pic': pic,
                     'heroTag': heroTag,
-                    'videoType': SearchType.media_bangumi,
+                    // 'videoType': SearchType.media_bangumi,
                     'bangumiItem': res['data'],
                   },
                 );

lib/pages/danmaku/controller.dart

@@ -10,34 +10,22 @@ class PlDanmakuController {
   // 按 6min 分段
   int segCount = 0;
   List<DmSegMobileReply> dmSegList = [];
-  // 已请求的段落标记
-  List<int> hasrequestSeg = [];
-  int currentSegIndex = 1;
+  int currentSegIndex = 0;
   int currentDmIndex = 0;
 
   void calcSegment() {
-    dmSegList.clear();
-    // 视频分段数
     segCount = (videoDuration.inSeconds / (60 * 6)).ceil();
-    dmSegList = List<DmSegMobileReply>.generate(
-        segCount < 1 ? 1 : segCount, (index) => DmSegMobileReply());
-    // 当前分段
-    try {
-      currentSegIndex =
-          (playerController.position.value.inSeconds / (60 * 6)).ceil();
-      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
-    } catch (_) {}
   }
 
   Future<List<DmSegMobileReply>> queryDanmaku() async {
-    // dmSegList.clear();
-    DmSegMobileReply result =
-        await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: currentSegIndex);
-    if (result.elems.isNotEmpty) {
-      result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
-      // dmSegList.add(result);
-      currentSegIndex = currentSegIndex < 1 ? 1 : currentSegIndex;
-      dmSegList[currentSegIndex - 1] = result;
+    dmSegList.clear();
+    for (int segIndex = 1; segIndex <= segCount; segIndex++) {
+      DmSegMobileReply result =
+          await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segIndex);
+      if (result.elems.isNotEmpty) {
+        result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
+        dmSegList.add(result);
+      }
     }
     if (dmSegList.isNotEmpty) {
       findClosestPositionIndex(playerController.position.value.inMilliseconds);

lib/pages/danmaku/view.dart

@@ -1,4 +1,3 @@
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -86,22 +85,12 @@ class _PlDanmakuState extends State<PlDanmaku> {
       _controller!.onResume();
       danmuPlayStatus = true;
     }
-    if (!playerController.isOpenDanmu.value) {
-      return;
-    }
     PlDanmakuController ctr = _plDanmakuController;
     int currentPosition = position.inMilliseconds;
     blockTypes = playerController.blockTypes;
-    // 根据position判断是否有已缓存弹幕。没有则请求对应段
-    int segIndex = (currentPosition / (6 * 60 * 1000)).ceil();
-    segIndex = segIndex < 1 ? 1 : segIndex;
-    if (ctr.dmSegList[segIndex - 1].elems.isEmpty &&
-        !ctr.hasrequestSeg.contains(segIndex - 1)) {
-      ctr.hasrequestSeg.add(segIndex - 1);
-      ctr.currentSegIndex = segIndex;
-      EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-        ctr.queryDanmaku();
-      });
+
+    if (!playerController.isOpenDanmu.value) {
+      return;
     }
     // 超出分段数返回
     if (ctr.currentSegIndex >= ctr.dmSegList.length) {
@@ -151,30 +140,23 @@ class _PlDanmakuState extends State<PlDanmaku> {
 
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, box) {
-      double initDuration = box.maxWidth / 12;
-      return Obx(
-        () => AnimatedOpacity(
-          opacity: playerController.isOpenDanmu.value ? 1 : 0,
-          duration: const Duration(milliseconds: 100),
-          child: DanmakuView(
-            createdController: (DanmakuController e) async {
-              widget.playerController.danmakuController = _controller = e;
-            },
-            option: DanmakuOption(
-              fontSize: 15 * fontSizeVal,
-              area: showArea,
-              opacity: opacityVal,
-              hideTop: blockTypes.contains(5),
-              hideScroll: blockTypes.contains(2),
-              hideBottom: blockTypes.contains(4),
-              duration: initDuration /
-                  (danmakuSpeedVal * widget.playerController.playbackSpeed),
-            ),
-            statusChanged: (isPlaying) {},
+    return Obx(
+      () => AnimatedOpacity(
+        opacity: playerController.isOpenDanmu.value ? 1 : 0,
+        duration: const Duration(milliseconds: 100),
+        child: DanmakuView(
+          createdController: (DanmakuController e) async {
+            widget.playerController.danmakuController = _controller = e;
+          },
+          option: DanmakuOption(
+            fontSize: 15 * fontSizeVal,
+            area: showArea,
+            opacity: opacityVal,
+            duration: danmakuSpeedVal * widget.playerController.playbackSpeed,
           ),
+          statusChanged: (isPlaying) {},
         ),
-      );
-    });
+      ),
+    );
   }
 }

lib/pages/dynamics/controller.dart

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

lib/pages/dynamics/deatil/controller.dart

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

lib/pages/dynamics/deatil/view.dart

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

lib/pages/dynamics/widgets/additional_panel.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
-import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/http/search.dart';
 
 /// TODO 点击跳转
 Widget addWidget(item, context, type, {floor = 1}) {
@@ -22,27 +19,8 @@ Widget addWidget(item, context, type, {floor = 1}) {
       : Theme.of(context).colorScheme.background;
   switch (type) {
     case 'ADDITIONAL_TYPE_UGC':
-      // 转发的投稿
       return InkWell(
-        onTap: () async {
-          String text = dynamicProperty[type].jumpUrl;
-          RegExp bvRegex = RegExp(r'BV[0-9A-Za-z]{10}', caseSensitive: false);
-          Iterable<Match> matches = bvRegex.allMatches(text);
-          if (matches.isNotEmpty) {
-            Match match = matches.first;
-            String bvid = match.group(0)!;
-            String cover = dynamicProperty[type].cover;
-            try {
-              int cid = await SearchHttp.ab2c(bvid: bvid);
-              Get.toNamed('/video?bvid=$bvid&cid=$cid',
-                  arguments: {'pic': cover, 'heroTag': bvid});
-            } catch (err) {
-              SmartDialog.showToast(err.toString());
-            }
-          } else {
-            print("No match found.");
-          }
-        },
+        onTap: () {},
         child: Container(
           padding:
               const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
@@ -83,111 +61,101 @@ Widget addWidget(item, context, type, {floor = 1}) {
       );
     case 'ADDITIONAL_TYPE_RESERVE':
       return dynamicProperty[type].state != -1
-          ? dynamicProperty[type].title != null
-              ? Padding(
-                  padding: const EdgeInsets.only(top: 8),
-                  child: InkWell(
-                    onTap: () {},
-                    child: Container(
-                      width: double.infinity,
-                      padding: const EdgeInsets.only(
-                          left: 12, top: 10, right: 12, bottom: 10),
-                      color: bgColor,
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            dynamicProperty[type].title,
-                            maxLines: 1,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                          const SizedBox(height: 1),
-                          Text.rich(
-                            TextSpan(
-                              style: TextStyle(
-                                  color: Theme.of(context).colorScheme.outline,
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .labelMedium!
-                                      .fontSize),
-                              children: [
-                                if (dynamicProperty[type].desc1 != null)
-                                  TextSpan(
-                                      text:
-                                          dynamicProperty[type].desc1['text']),
-                                const TextSpan(text: '  '),
-                                if (dynamicProperty[type].desc2 != null)
-                                  TextSpan(
-                                      text:
-                                          dynamicProperty[type].desc2['text']),
-                              ],
-                            ),
-                          )
-                        ],
+          ? Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: InkWell(
+                onTap: () {},
+                child: Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.only(
+                      left: 12, top: 10, right: 12, bottom: 10),
+                  color: bgColor,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        dynamicProperty[type].title,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
                       ),
-                      // TextButton(onPressed: () {}, child: Text('123'))
-                    ),
+                      const SizedBox(height: 1),
+                      Text.rich(
+                        TextSpan(
+                          style: TextStyle(
+                              color: Theme.of(context).colorScheme.outline,
+                              fontSize: Theme.of(context)
+                                  .textTheme
+                                  .labelMedium!
+                                  .fontSize),
+                          children: [
+                            TextSpan(text: dynamicProperty[type].desc1['text']),
+                            const TextSpan(text: '  '),
+                            TextSpan(text: dynamicProperty[type].desc2['text']),
+                          ],
+                        ),
+                      )
+                    ],
                   ),
-                )
-              : const SizedBox()
+                  // TextButton(onPressed: () {}, child: Text('123'))
+                ),
+              ),
+            )
           : const SizedBox();
     case 'ADDITIONAL_TYPE_GOODS':
-      // 商品
-      return const SizedBox();
-    // return Padding(
-    //     padding: const EdgeInsets.only(top: 6),
-    //     child: InkWell(
-    //       onTap: () {},
-    //       child: Container(
-    //         padding:
-    //             const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
-    //         decoration: BoxDecoration(
-    //           color: bgColor,
-    //           borderRadius: const BorderRadius.all(Radius.circular(6)),
-    //         ),
-    //         child: Row(
-    //           children: [
-    //             NetworkImgLayer(
-    //               width: 75,
-    //               height: 75,
-    //               src: dynamicProperty[type].items.first.cover,
-    //             ),
-    //             const SizedBox(width: 10),
-    //             Expanded(
-    //               child: Column(
-    //                 crossAxisAlignment: CrossAxisAlignment.start,
-    //                 mainAxisAlignment: MainAxisAlignment.start,
-    //                 children: [
-    //                   Text(
-    //                     dynamicProperty[type].items.first.name,
-    //                     maxLines: 1,
-    //                     overflow: TextOverflow.ellipsis,
-    //                   ),
-    //                   Text(
-    //                     dynamicProperty[type].items.first.brief,
-    //                     maxLines: 1,
-    //                     style: TextStyle(
-    //                       color: Theme.of(context).colorScheme.outline,
-    //                       fontSize: Theme.of(context)
-    //                           .textTheme
-    //                           .labelMedium!
-    //                           .fontSize,
-    //                     ),
-    //                   ),
-    //                   const SizedBox(height: 2),
-    //                   Text(
-    //                     dynamicProperty[type].items.first.price,
-    //                     style: TextStyle(
-    //                       color: Theme.of(context).colorScheme.primary,
-    //                     ),
-    //                   ),
-    //                 ],
-    //               ),
-    //             ),
-    //           ],
-    //         ),
-    //       ),
-    //     ),);
+      return Padding(
+          padding: const EdgeInsets.only(top: 6),
+          child: InkWell(
+            onTap: () {},
+            child: Container(
+              padding:
+                  const EdgeInsets.only(left: 12, top: 8, right: 12, bottom: 8),
+              decoration: BoxDecoration(
+                color: bgColor,
+                borderRadius: const BorderRadius.all(Radius.circular(6)),
+              ),
+              child: Row(
+                children: [
+                  NetworkImgLayer(
+                    width: 75,
+                    height: 75,
+                    src: dynamicProperty[type].items.first.cover,
+                  ),
+                  const SizedBox(width: 10),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Text(
+                          dynamicProperty[type].items.first.name,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                        Text(
+                          dynamicProperty[type].items.first.brief,
+                          maxLines: 1,
+                          style: TextStyle(
+                            color: Theme.of(context).colorScheme.outline,
+                            fontSize: Theme.of(context)
+                                .textTheme
+                                .labelMedium!
+                                .fontSize,
+                          ),
+                        ),
+                        const SizedBox(height: 2),
+                        Text(
+                          dynamicProperty[type].items.first.price,
+                          style: TextStyle(
+                            color: Theme.of(context).colorScheme.primary,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ));
     case 'ADDITIONAL_TYPE_MATCH':
       return const SizedBox();
     case 'ADDITIONAL_TYPE_COMMON':

lib/pages/dynamics/widgets/author_panel.dart

@@ -1,163 +1,65 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/http/user.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
-class AuthorPanel extends StatelessWidget {
-  final dynamic item;
-  const AuthorPanel({super.key, required this.item});
-
-  @override
-  Widget build(BuildContext context) {
-    String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid);
-    return Row(
-      children: [
-        GestureDetector(
-          onTap: () {
-            // 番剧
-            if (item.modules.moduleAuthor.type == 'AUTHOR_TYPE_PGC') {
-              return;
-            }
-            feedBack();
-            Get.toNamed(
-              '/member?mid=${item.modules.moduleAuthor.mid}',
-              arguments: {
-                'face': item.modules.moduleAuthor.face,
-                'heroTag': heroTag
-              },
-            );
-          },
-          child: Hero(
-            tag: heroTag,
-            child: NetworkImgLayer(
-              width: 40,
-              height: 40,
-              type: 'avatar',
-              src: item.modules.moduleAuthor.face,
-            ),
-          ),
-        ),
-        const SizedBox(width: 10),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              item.modules.moduleAuthor.name,
-              style: TextStyle(
-                color: item.modules.moduleAuthor!.vip != null &&
-                        item.modules.moduleAuthor!.vip['status'] > 0
-                    ? const Color.fromARGB(255, 251, 100, 163)
-                    : Theme.of(context).colorScheme.onBackground,
-                fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
-              ),
-            ),
-            DefaultTextStyle.merge(
-              style: TextStyle(
-                color: Theme.of(context).colorScheme.outline,
-                fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-              ),
-              child: Row(
-                children: [
-                  Text(item.modules.moduleAuthor.pubTime),
-                  if (item.modules.moduleAuthor.pubTime != '' &&
-                      item.modules.moduleAuthor.pubAction != '')
-                    const Text(' '),
-                  Text(item.modules.moduleAuthor.pubAction),
-                ],
-              ),
-            )
-          ],
-        ),
-        const Spacer(),
-        if (item.type == 'DYNAMIC_TYPE_AV')
-          SizedBox(
-            width: 32,
-            height: 32,
-            child: IconButton(
-              style: ButtonStyle(
-                padding: MaterialStateProperty.all(EdgeInsets.zero),
-              ),
-              onPressed: () {
-                showModalBottomSheet(
-                  context: context,
-                  useRootNavigator: true,
-                  isScrollControlled: true,
-                  builder: (context) {
-                    return MorePanel(item: item);
-                  },
-                );
-              },
-              icon: const Icon(Icons.more_vert_outlined, size: 18),
-            ),
-          ),
-      ],
-    );
-  }
-}
-
-class MorePanel extends StatelessWidget {
-  final dynamic item;
-  const MorePanel({super.key, required this.item});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      // clipBehavior: Clip.hardEdge,
-      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 {
-              try {
-                String bvid = item.modules.moduleDynamic.major.archive.bvid;
-                var res = await UserHttp.toViewLater(bvid: bvid);
-                SmartDialog.showToast(res['msg']);
-                Get.back();
-              } catch (err) {
-                SmartDialog.showToast('出错了：${err.toString()}');
-              }
+Widget author(item, context) {
+  String heroTag = Utils.makeHeroTag(item.modules.moduleAuthor.mid);
+  return Row(
+    children: [
+      GestureDetector(
+        onTap: () {
+          feedBack();
+          Get.toNamed(
+            '/member?mid=${item.modules.moduleAuthor.mid}',
+            arguments: {
+              'face': item.modules.moduleAuthor.face,
+              'heroTag': heroTag
             },
-            minLeadingWidth: 0,
-            // dense: true,
-            leading: const Icon(Icons.watch_later_outlined, size: 19),
-            title: Text(
-              '稍后再看',
-              style: Theme.of(context).textTheme.titleSmall,
+          );
+        },
+        child: Hero(
+          tag: heroTag,
+          child: NetworkImgLayer(
+            width: 40,
+            height: 40,
+            type: 'avatar',
+            src: item.modules.moduleAuthor.face,
+          ),
+        ),
+      ),
+      const SizedBox(width: 10),
+      Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            item.modules.moduleAuthor.name,
+            style: TextStyle(
+              color: item.modules.moduleAuthor!.vip != null &&
+                      item.modules.moduleAuthor!.vip['status'] > 0
+                  ? const Color.fromARGB(255, 251, 100, 163)
+                  : Theme.of(context).colorScheme.onBackground,
+              fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
             ),
           ),
-          const Divider(thickness: 0.1, height: 1),
-          ListTile(
-            onTap: () => Get.back(),
-            minLeadingWidth: 0,
-            dense: true,
-            title: Text(
-              '取消',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              textAlign: TextAlign.center,
+          DefaultTextStyle.merge(
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.outline,
+              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
             ),
-          ),
+            child: Row(
+              children: [
+                Text(item.modules.moduleAuthor.pubTime),
+                if (item.modules.moduleAuthor.pubTime != '' &&
+                    item.modules.moduleAuthor.pubAction != '')
+                  const Text(' '),
+                Text(item.modules.moduleAuthor.pubAction),
+              ],
+            ),
+          )
         ],
       ),
-    );
-  }
+    ],
+  );
 }

lib/pages/dynamics/widgets/content_panel.dart

@@ -1,183 +1,42 @@
 // 内容
 import 'package:flutter/material.dart';
-import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/pages/preview/index.dart';
 
 import 'rich_node_panel.dart';
 
-// ignore: must_be_immutable
-class Content extends StatefulWidget {
-  dynamic item;
-  String? source;
-  Content({
-    super.key,
-    this.item,
-    this.source,
-  });
-
-  @override
-  State<Content> createState() => _ContentState();
-}
-
-class _ContentState extends State<Content> {
-  late bool hasPics;
-  List<OpusPicsModel> pics = [];
-
-  @override
-  void initState() {
-    super.initState();
-    hasPics = widget.item.modules.moduleDynamic.major != null &&
-        widget.item.modules.moduleDynamic.major.opus != null &&
-        widget.item.modules.moduleDynamic.major.opus.pics.isNotEmpty;
-    if (hasPics) {
-      pics = widget.item.modules.moduleDynamic.major.opus.pics;
-    }
-  }
-
-  InlineSpan picsNodes() {
-    List<InlineSpan> spanChilds = [];
-    int len = pics.length;
-    List<String> picList = [];
-
-    if (len == 1) {
-      OpusPicsModel pictureItem = pics.first;
-      picList.add(pictureItem.url!);
-      spanChilds.add(const TextSpan(text: '\n'));
-      spanChilds.add(
-        WidgetSpan(
-          child: LayoutBuilder(
-            builder: (context, BoxConstraints box) {
-              return GestureDetector(
-                onTap: () {
-                  showDialog(
-                    useSafeArea: false,
-                    context: context,
-                    builder: (context) {
-                      return ImagePreview(initialPage: 0, imgList: picList);
-                    },
-                  );
-                },
-                child: Padding(
-                  padding: const EdgeInsets.only(top: 4),
-                  child: NetworkImgLayer(
-                    src: pictureItem.url,
-                    width: box.maxWidth / 2,
-                    height: box.maxWidth *
-                        0.5 *
-                        (pictureItem.height != null && pictureItem.width != null
-                            ? pictureItem.height! / pictureItem.width!
-                            : 1),
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      );
-    }
-    if (len > 1) {
-      List<Widget> list = [];
-      for (var i = 0; i < len; i++) {
-        picList.add(pics[i].url!);
-        list.add(
-          LayoutBuilder(
-            builder: (context, BoxConstraints box) {
-              return GestureDetector(
-                onTap: () {
-                  showDialog(
-                    useSafeArea: false,
-                    context: context,
-                    builder: (context) {
-                      return ImagePreview(initialPage: i, imgList: picList);
-                    },
-                  );
-                },
-                child: NetworkImgLayer(
-                  src: pics[i].url,
-                  width: box.maxWidth,
-                  height: box.maxWidth,
-                ),
-              );
-            },
-          ),
-        );
-      }
-      spanChilds.add(
-        WidgetSpan(
-          child: LayoutBuilder(
-            builder: (context, BoxConstraints box) {
-              double maxWidth = box.maxWidth;
-              double crossCount = len < 3 ? 2 : 3;
-              double height = maxWidth /
-                      crossCount *
-                      (len % crossCount == 0
-                          ? len ~/ crossCount
-                          : len ~/ crossCount + 1) +
-                  6;
-              return Container(
-                padding: const EdgeInsets.only(top: 6),
-                height: height,
-                child: GridView.count(
-                  padding: EdgeInsets.zero,
-                  physics: const NeverScrollableScrollPhysics(),
-                  crossAxisCount: crossCount.toInt(),
-                  mainAxisSpacing: 4.0,
-                  crossAxisSpacing: 4.0,
-                  childAspectRatio: 1,
-                  children: list,
-                ),
-              );
-            },
-          ),
-        ),
-      );
-    }
-    return TextSpan(
-      children: spanChilds,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    TextStyle authorStyle =
-        TextStyle(color: Theme.of(context).colorScheme.primary);
-
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          if (widget.item.modules.moduleDynamic.topic != null) ...[
-            GestureDetector(
-              child: Text(
-                '#${widget.item.modules.moduleDynamic.topic.name}',
-                style: authorStyle,
-              ),
-            ),
-          ],
-          IgnorePointer(
-            // 禁用SelectableRegion的触摸交互功能
-            ignoring: widget.source == 'detail' ? false : true,
-            child: SelectableRegion(
-              magnifierConfiguration: const TextMagnifierConfiguration(),
-              focusNode: FocusNode(),
-              selectionControls: MaterialTextSelectionControls(),
-              child: Text.rich(
-                /// fix 默认20px高度
-                style: const TextStyle(height: 0),
-                richNode(widget.item, context),
-                maxLines: widget.source == 'detail' ? 999 : 3,
-                overflow: TextOverflow.ellipsis,
-              ),
+Widget content(item, context, source) {
+  TextStyle authorStyle =
+      TextStyle(color: Theme.of(context).colorScheme.primary);
+  return Container(
+    width: double.infinity,
+    padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
+    child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (item.modules.moduleDynamic.topic != null) ...[
+          GestureDetector(
+            child: Text(
+              '#${item.modules.moduleDynamic.topic.name}',
+              style: authorStyle,
             ),
           ),
-          if (hasPics) ...[
-            Text.rich(picsNodes()),
-          ]
         ],
-      ),
-    );
-  }
+        IgnorePointer(
+          // 禁用SelectableRegion的触摸交互功能
+          ignoring: source == 'detail' ? false : true,
+          child: SelectableRegion(
+            magnifierConfiguration: const TextMagnifierConfiguration(),
+            focusNode: FocusNode(),
+            selectionControls: MaterialTextSelectionControls(),
+            child: Text.rich(
+              /// fix 默认20px高度
+              style: const TextStyle(height: 0),
+              richNode(item, context),
+              maxLines: source == 'detail' ? 999 : 3,
+              overflow: TextOverflow.ellipsis,
+            ),
+          ),
+        ),
+      ],
+    ),
+  );
 }

lib/pages/dynamics/widgets/dynamic_panel.dart

@@ -39,11 +39,11 @@ class DynamicPanel extends StatelessWidget {
             children: [
               Padding(
                 padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
-                child: AuthorPanel(item: item),
+                child: author(item, context),
               ),
               if (item!.modules!.moduleDynamic!.desc != null ||
                   item!.modules!.moduleDynamic!.major != null)
-                Content(item: item, source: source),
+                content(item, context, source),
               forWard(item, context, _dynamicsController, source),
               const SizedBox(height: 2),
               if (source == null) ActionPanel(item: item),

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -27,9 +27,8 @@ InlineSpan richNode(item, context) {
     } else {
       for (var i in richTextNodes) {
         /// fix 渲染专栏时内容会重复
-        // if (item.modules.moduleDynamic.major.opus.title == null &&
-        //     i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
-        if (i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
+        if (item.modules.moduleDynamic.major.opus.title == null &&
+            i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
           spanChilds.add(
               TextSpan(text: i.origText, style: const TextStyle(height: 1.65)));
         }
@@ -110,18 +109,16 @@ InlineSpan richNode(item, context) {
               alignment: PlaceholderAlignment.middle,
               child: GestureDetector(
                 onTap: () {
-                  try {
-                    String dynamicId = item.basic['comment_id_str'];
-                    Get.toNamed(
-                      '/webview',
-                      parameters: {
-                        'url':
-                            'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1',
-                        'type': 'vote',
-                        'pageTitle': '投票'
-                      },
-                    );
-                  } catch (_) {}
+                  String dynamicId = item.basic['comment_id_str'];
+                  Get.toNamed(
+                    '/webview',
+                    parameters: {
+                      'url':
+                          'https://t.bilibili.com/vote/h5/index/#/result?vote_id=${i.rid}&dynamic_id=$dynamicId&isWeb=1',
+                      'type': 'vote',
+                      'pageTitle': '投票'
+                    },
+                  );
                 },
                 child: Text(
                   '投票：${i.text}',
@@ -196,118 +193,116 @@ InlineSpan richNode(item, context) {
           );
         }
       }
-      // if (contentType == 'major' &&
-      //     item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
-      //   // 图片可能跟其他widget重复渲染
-      //   List<OpusPicsModel> pics = item.modules.moduleDynamic.major.opus.pics;
-      //   int len = pics.length;
-      //   List<String> picList = [];
+      if (contentType == 'major' &&
+          item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
+        // 图片可能跟其他widget重复渲染
+        List<OpusPicsModel> pics = item.modules.moduleDynamic.major.opus.pics;
+        int len = pics.length;
+        List<String> picList = [];
 
-      //   if (len == 1) {
-      //     OpusPicsModel pictureItem = pics.first;
-      //     picList.add(pictureItem.url!);
-      //     spanChilds.add(const TextSpan(text: '\n'));
-      //     spanChilds.add(
-      //       WidgetSpan(
-      //         child: LayoutBuilder(
-      //           builder: (context, BoxConstraints box) {
-      //             return GestureDetector(
-      //               onTap: () {
-      //                 showDialog(
-      //                   useSafeArea: false,
-      //                   context: context,
-      //                   builder: (context) {
-      //                     return ImagePreview(initialPage: 0, imgList: picList);
-      //                   },
-      //                 );
-      //               },
-      //               child: Padding(
-      //                 padding: const EdgeInsets.only(top: 4),
-      //                 child: NetworkImgLayer(
-      //                   src: pictureItem.url,
-      //                   width: box.maxWidth / 2,
-      //                   height: box.maxWidth *
-      //                       0.5 *
-      //                       (pictureItem.height != null &&
-      //                               pictureItem.width != null
-      //                           ? pictureItem.height! / pictureItem.width!
-      //                           : 1),
-      //                 ),
-      //               ),
-      //             );
-      //           },
-      //         ),
-      //       ),
-      //     );
-      //   }
-      // if (len > 1) {
-      //   List<Widget> list = [];
-      //   for (var i = 0; i < len; i++) {
-      //     picList.add(pics[i].url!);
-      //     list.add(
-      //       LayoutBuilder(
-      //         builder: (context, BoxConstraints box) {
-      //           return GestureDetector(
-      //             onTap: () {
-      //               showDialog(
-      //                 useSafeArea: false,
-      //                 context: context,
-      //                 builder: (context) {
-      //                   return ImagePreview(initialPage: i, imgList: picList);
-      //                 },
-      //               );
-      //             },
-      //             child: NetworkImgLayer(
-      //               src: pics[i].url,
-      //               width: box.maxWidth,
-      //               height: box.maxWidth,
-      //             ),
-      //           );
-      //         },
-      //       ),
-      //     );
-      //   }
-      //   spanChilds.add(
-      //     WidgetSpan(
-      //       child: LayoutBuilder(
-      //         builder: (context, BoxConstraints box) {
-      //           double maxWidth = box.maxWidth;
-      //           double crossCount = len < 3 ? 2 : 3;
-      //           double height = maxWidth /
-      //                   crossCount *
-      //                   (len % crossCount == 0
-      //                       ? len ~/ crossCount
-      //                       : len ~/ crossCount + 1) +
-      //               6;
-      //           return Container(
-      //             padding: const EdgeInsets.only(top: 6),
-      //             height: height,
-      //             child: GridView.count(
-      //               padding: EdgeInsets.zero,
-      //               physics: const NeverScrollableScrollPhysics(),
-      //               crossAxisCount: crossCount.toInt(),
-      //               mainAxisSpacing: 4.0,
-      //               crossAxisSpacing: 4.0,
-      //               childAspectRatio: 1,
-      //               children: list,
-      //             ),
-      //           );
-      //         },
-      //       ),
-      //     ),
-      //   );
-      // }
-      // spanChilds.add(
-      //   WidgetSpan(
-      //     child: NetworkImgLayer(
-      //       src: pics.first.url,
-      //       type: 'emote',
-      //       width: 100,
-      //       height: 200,
-      //     ),
-      //   ),
-      // );
-      // }
+        if (len == 1) {
+          OpusPicsModel pictureItem = pics.first;
+          picList.add(pictureItem.url!);
+          spanChilds.add(const TextSpan(text: '\n'));
+          spanChilds.add(
+            WidgetSpan(
+              child: LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  return GestureDetector(
+                    onTap: () {
+                      showDialog(
+                        useSafeArea: false,
+                        context: context,
+                        builder: (context) {
+                          return ImagePreview(initialPage: 0, imgList: picList);
+                        },
+                      );
+                    },
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 4),
+                      child: NetworkImgLayer(
+                        src: pictureItem.url,
+                        width: box.maxWidth / 2,
+                        height: box.maxWidth *
+                            0.5 *
+                            pictureItem.height! /
+                            pictureItem.width!,
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ),
+          );
+        }
+        if (len > 1) {
+          List<Widget> list = [];
+          for (var i = 0; i < len; i++) {
+            picList.add(pics[i].url!);
+            list.add(
+              LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  return GestureDetector(
+                    onTap: () {
+                      showDialog(
+                        useSafeArea: false,
+                        context: context,
+                        builder: (context) {
+                          return ImagePreview(initialPage: i, imgList: picList);
+                        },
+                      );
+                    },
+                    child: NetworkImgLayer(
+                      src: pics[i].url,
+                      width: box.maxWidth,
+                      height: box.maxWidth,
+                    ),
+                  );
+                },
+              ),
+            );
+          }
+          spanChilds.add(
+            WidgetSpan(
+              child: LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  double maxWidth = box.maxWidth;
+                  double crossCount = len < 3 ? 2 : 3;
+                  double height = maxWidth /
+                          crossCount *
+                          (len % crossCount == 0
+                              ? len ~/ crossCount
+                              : len ~/ crossCount + 1) +
+                      6;
+                  return Container(
+                    padding: const EdgeInsets.only(top: 6),
+                    height: height,
+                    child: GridView.count(
+                      padding: EdgeInsets.zero,
+                      physics: const NeverScrollableScrollPhysics(),
+                      crossAxisCount: crossCount.toInt(),
+                      mainAxisSpacing: 4.0,
+                      crossAxisSpacing: 4.0,
+                      childAspectRatio: 1,
+                      children: list,
+                    ),
+                  );
+                },
+              ),
+            ),
+          );
+        }
+        // spanChilds.add(
+        //   WidgetSpan(
+        //     child: NetworkImgLayer(
+        //       src: pics.first.url,
+        //       type: 'emote',
+        //       width: 100,
+        //       height: 200,
+        //     ),
+        //   ),
+        // );
+      }
       return TextSpan(
         children: spanChilds,
       );

lib/pages/dynamics/widgets/up_panel.dart

@@ -91,10 +91,7 @@ class _UpPanelState extends State<UpPanel> {
                 ),
                 Material(
                   child: InkWell(
-                    onTap: () => {
-                      feedBack(),
-                      Get.toNamed('/follow?mid=${userInfo.mid}')
-                    },
+                    onTap: () => {feedBack(), Get.toNamed('/follow')},
                     child: Container(
                       height: 100,
                       padding: const EdgeInsets.only(left: 10, right: 10),

lib/pages/fan/view.dart

@@ -16,16 +16,13 @@ class FansPage extends StatefulWidget {
 }
 
 class _FansPageState extends State<FansPage> {
-  late String mid;
-  late FansController _fansController;
+  final FansController _fansController = Get.put(FansController());
   final ScrollController scrollController = ScrollController();
   Future? _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
-    mid = Get.parameters['mid']!;
-    _fansController = Get.put(FansController(), tag: mid);
     _futureBuilderFuture = _fansController.queryFans('init');
     scrollController.addListener(
       () async {

lib/pages/fav/view.dart

@@ -44,14 +44,6 @@ class _FavPageState extends State<FavPage> {
           '我的收藏',
           style: Theme.of(context).textTheme.titleMedium,
         ),
-        actions: [
-          IconButton(
-            onPressed: () => Get.toNamed(
-                '/favSearch?searchType=1&mediaId=${_favController.favFolderData.value.list!.first.id}'),
-            icon: const Icon(Icons.search_outlined),
-          ),
-          const SizedBox(width: 6),
-        ],
       ),
       body: FutureBuilder(
         future: _futureBuilderFuture,

lib/pages/favDetail/view.dart

@@ -92,18 +92,13 @@ class _FavDetailPageState extends State<FavDetailPage> {
                 );
               },
             ),
-            actions: [
-              IconButton(
-                onPressed: () => Get.toNamed(
-                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
-                icon: const Icon(Icons.search_outlined),
-              ),
-              //   IconButton(
-              //     onPressed: () {},
-              //     icon: const Icon(Icons.more_vert),
-              //   ),
-              const SizedBox(width: 6),
-            ],
+            // actions: [
+            //   IconButton(
+            //     onPressed: () {},
+            //     icon: const Icon(Icons.more_vert),
+            //   ),
+            //   const SizedBox(width: 4)
+            // ],
             flexibleSpace: FlexibleSpaceBar(
               background: Container(
                 decoration: BoxDecoration(

lib/pages/favDetail/widget/fav_video_card.dart

@@ -49,8 +49,8 @@ class FavVideoCardH extends StatelessWidget {
         Get.toNamed('/video', parameters: parameters, arguments: {
           'videoItem': videoItem,
           'heroTag': heroTag,
-          'videoType':
-              epId != null ? SearchType.media_bangumi : SearchType.video,
+          // 'videoType':
+          //     epId != null ? SearchType.media_bangumi : SearchType.video,
         });
       },
       child: Column(
@@ -142,21 +142,15 @@ class VideoContent extends StatelessWidget {
               overflow: TextOverflow.ellipsis,
             ),
             const Spacer(),
-            Text(
-              videoItem.owner.name,
-              style: TextStyle(
-                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-            ),
             Row(
               children: [
-                StatView(
-                  theme: 'gray',
-                  view: videoItem.cntInfo['play'],
+                Text(
+                  videoItem.owner.name,
+                  style: TextStyle(
+                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    color: Theme.of(context).colorScheme.outline,
+                  ),
                 ),
-                const SizedBox(width: 8),
-                StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
                 const Spacer(),
                 SizedBox(
                   width: 26,

lib/pages/fav_search/controller.dart

@@ -1,75 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/http/user.dart';
-import 'package:pilipala/models/user/fav_detail.dart';
-
-class FavSearchController extends GetxController {
-  final ScrollController scrollController = ScrollController();
-  Rx<TextEditingController> controller = TextEditingController().obs;
-  final FocusNode searchFocusNode = FocusNode();
-  RxString searchKeyWord = ''.obs; // 搜索词
-  String hintText = '请输入已收藏视频名称'; // 默认
-  RxBool loadingStatus = false.obs; // 加载状态
-  RxString loadingText = '加载中...'.obs; // 加载提示
-  bool hasMore = false;
-  late int searchType;
-  late int mediaId;
-
-  int currentPage = 1; // 当前页
-  int count = 0; // 总数
-  RxList<FavDetailItemData> favList = <FavDetailItemData>[].obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    searchType = int.parse(Get.parameters['searchType']!);
-    mediaId = int.parse(Get.parameters['mediaId']!);
-  }
-
-  // 清空搜索
-  void onClear() {
-    if (searchKeyWord.value.isNotEmpty && controller.value.text != '') {
-      controller.value.clear();
-      searchKeyWord.value = '';
-    } else {
-      Get.back();
-    }
-  }
-
-  void onChange(value) {
-    searchKeyWord.value = value;
-  }
-
-  //  提交搜索内容
-  void submit() {
-    loadingStatus.value = true;
-    currentPage = 1;
-    searchFav();
-  }
-
-  // 搜索收藏夹视频
-  Future searchFav({type = 'init'}) async {
-    var res = await await UserHttp.userFavFolderDetail(
-      pn: currentPage,
-      ps: 20,
-      mediaId: mediaId,
-      keyword: searchKeyWord.value,
-      type: searchType,
-    );
-    if (res['status']) {
-      if (currentPage == 1 && type == 'init') {
-        favList.value = res['data'].medias;
-      } else if (type == 'onLoad') {
-        favList.addAll(res['data'].medias);
-      }
-      hasMore = res['data'].hasMore;
-    }
-    currentPage += 1;
-    loadingStatus.value = false;
-  }
-
-  onLoad() {
-    if (!hasMore) return;
-    searchFav(type: 'onLoad');
-  }
-}

lib/pages/fav_search/index.dart

@@ -1,4 +0,0 @@
-library fav_search;
-
-export './controller.dart';
-export './view.dart';

lib/pages/fav_search/view.dart

@@ -1,116 +0,0 @@
-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/no_data.dart';
-import 'package:pilipala/pages/favDetail/widget/fav_video_card.dart';
-
-import 'controller.dart';
-
-class FavSearchPage extends StatefulWidget {
-  final int? sourceType;
-  final int? mediaId;
-  const FavSearchPage({super.key, this.sourceType, this.mediaId});
-
-  @override
-  State<FavSearchPage> createState() => _FavSearchPageState();
-}
-
-class _FavSearchPageState extends State<FavSearchPage> {
-  final FavSearchController _favSearchCtr = Get.put(FavSearchController());
-  late ScrollController scrollController;
-
-  @override
-  void initState() {
-    super.initState();
-
-    scrollController = _favSearchCtr.scrollController;
-    scrollController.addListener(
-      () {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('fav', const Duration(seconds: 1), () {
-            _favSearchCtr.onLoad();
-          });
-        }
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(() {});
-    scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        titleSpacing: 0,
-        actions: [
-          IconButton(
-              onPressed: () => _favSearchCtr.submit(),
-              icon: const Icon(Icons.search_outlined, size: 22)),
-          const SizedBox(width: 10)
-        ],
-        title: Obx(
-          () => TextField(
-            autofocus: true,
-            focusNode: _favSearchCtr.searchFocusNode,
-            controller: _favSearchCtr.controller.value,
-            textInputAction: TextInputAction.search,
-            onChanged: (value) => _favSearchCtr.onChange(value),
-            decoration: InputDecoration(
-              hintText: _favSearchCtr.hintText,
-              border: InputBorder.none,
-              suffixIcon: IconButton(
-                icon: Icon(
-                  Icons.clear,
-                  size: 22,
-                  color: Theme.of(context).colorScheme.outline,
-                ),
-                onPressed: () => _favSearchCtr.onClear(),
-              ),
-            ),
-            onSubmitted: (String value) => _favSearchCtr.submit(),
-          ),
-        ),
-      ),
-      body: Obx(
-        () => _favSearchCtr.loadingStatus.value && _favSearchCtr.favList.isEmpty
-            ? ListView.builder(
-                itemCount: 10,
-                itemBuilder: (context, index) {
-                  return const VideoCardHSkeleton();
-                },
-              )
-            : _favSearchCtr.favList.isNotEmpty
-                ? ListView.builder(
-                    controller: scrollController,
-                    itemCount: _favSearchCtr.favList.length + 1,
-                    itemBuilder: (context, index) {
-                      if (index == _favSearchCtr.favList.length) {
-                        return Container(
-                          height: MediaQuery.of(context).padding.bottom + 60,
-                          padding: EdgeInsets.only(
-                              bottom: MediaQuery.of(context).padding.bottom),
-                        );
-                      } else {
-                        return FavVideoCardH(
-                          videoItem: _favSearchCtr.favList[index],
-                          callFn: () => null,
-                        );
-                      }
-                    },
-                  )
-                : const CustomScrollView(
-                    slivers: <Widget>[
-                      NoData(),
-                    ],
-                  ),
-      ),
-    );
-  }
-}

lib/pages/follow/controller.dart

@@ -1,28 +1,20 @@
-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/follow.dart';
-import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/follow/result.dart';
-import 'package:pilipala/models/member/tags.dart';
 import 'package:pilipala/utils/storage.dart';
 
-/// 查看自己的关注时，可以查看分类
-/// 查看其他人的关注时，只可以看全部
-class FollowController extends GetxController with GetTickerProviderStateMixin {
+class FollowController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
   int pn = 1;
   int ps = 20;
   int total = 0;
-  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
+  RxList<FollowItemModel> followList = [FollowItemModel()].obs;
   late int mid;
   late String name;
   var userInfo;
   RxString loadingText = '加载中...'.obs;
-  RxBool isOwner = false.obs;
-  late List<MemberTagItemModel> followTags;
-  late TabController tabController;
 
   @override
   void onInit() {
@@ -31,7 +23,6 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
         : userInfo.mid;
-    isOwner.value = mid == userInfo.mid;
     name = Get.parameters['name'] ?? userInfo.uname;
   }
 
@@ -65,20 +56,4 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
     }
     return res;
   }
-
-  // 当查看当前用户的关注时，请求关注分组
-  Future followUpTags() async {
-    if (userInfo != null && mid == userInfo.mid) {
-      var res = await MemberHttp.followUpTags();
-      if (res['status']) {
-        followTags = res['data'];
-        tabController = TabController(
-          initialIndex: 0,
-          length: res['data'].length,
-          vsync: this,
-        );
-      }
-      return res;
-    }
-  }
 }

lib/pages/follow/view.dart

@@ -1,8 +1,12 @@
+import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/common/widgets/no_data.dart';
+import 'package:pilipala/models/follow/result.dart';
+
 import 'controller.dart';
-import 'widgets/follow_list.dart';
-import 'widgets/owner_follow_list.dart';
+import 'widgets/follow_item.dart';
 
 class FollowPage extends StatefulWidget {
   const FollowPage({super.key});
@@ -12,15 +16,30 @@ class FollowPage extends StatefulWidget {
 }
 
 class _FollowPageState extends State<FollowPage> {
-  late String mid;
-  late FollowController _followController;
+  final FollowController _followController = Get.put(FollowController());
   final ScrollController scrollController = ScrollController();
+  Future? _futureBuilderFuture;
 
   @override
   void initState() {
     super.initState();
-    mid = Get.parameters['mid']!;
-    _followController = Get.put(FollowController(), tag: mid);
+    _futureBuilderFuture = _followController.queryFollowings('init');
+    scrollController.addListener(
+      () async {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
+            _followController.queryFollowings('onLoad');
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    scrollController.removeListener(() {});
+    super.dispose();
   }
 
   @override
@@ -32,57 +51,73 @@ class _FollowPageState extends State<FollowPage> {
         titleSpacing: 0,
         centerTitle: false,
         title: Text(
-          _followController.isOwner.value
-              ? '我的关注'
-              : '${_followController.name}的关注',
+          '${_followController.name}的关注',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),
-      body: Obx(
-        () => !_followController.isOwner.value
-            ? FollowList(ctr: _followController)
-            : FutureBuilder(
-                future: _followController.followUpTags(),
-                builder: (context, snapshot) {
-                  if (snapshot.connectionState == ConnectionState.done) {
-                    var data = snapshot.data;
-                    if (data['status']) {
-                      return Column(
-                        children: [
-                          TabBar(
-                              controller: _followController.tabController,
-                              isScrollable: true,
-                              tabs: [
-                                for (var i in data['data']) ...[
-                                  Tab(text: i.name),
-                                ]
-                              ]),
-                          Expanded(
-                            child: TabBarView(
-                              controller: _followController.tabController,
-                              children: [
-                                for (var i = 0;
-                                    i < _followController.tabController.length;
-                                    i++) ...[
-                                  OwnerFollowList(
-                                    ctr: _followController,
-                                    tagItem: _followController.followTags[i],
-                                  )
-                                ]
-                              ],
-                            ),
+      body: RefreshIndicator(
+          onRefresh: () async =>
+              await _followController.queryFollowings('init'),
+          child: FutureBuilder(
+            future: _futureBuilderFuture,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.done) {
+                var data = snapshot.data;
+                if (data['status']) {
+                  List<FollowItemModel> list = _followController.followList;
+                  return Obx(
+                    () => list.isNotEmpty
+                        ? ListView.builder(
+                            controller: scrollController,
+                            itemCount: list.length + 1,
+                            itemBuilder: (BuildContext context, int index) {
+                              if (index == list.length) {
+                                return Container(
+                                  height:
+                                      MediaQuery.of(context).padding.bottom +
+                                          60,
+                                  padding: EdgeInsets.only(
+                                      bottom: MediaQuery.of(context)
+                                          .padding
+                                          .bottom),
+                                  child: Center(
+                                    child: Obx(
+                                      () => Text(
+                                        _followController.loadingText.value,
+                                        style: TextStyle(
+                                            color: Theme.of(context)
+                                                .colorScheme
+                                                .outline,
+                                            fontSize: 13),
+                                      ),
+                                    ),
+                                  ),
+                                );
+                              } else {
+                                return followItem(item: list[index]);
+                              }
+                            },
+                          )
+                        : const CustomScrollView(
+                            slivers: [NoData()],
                           ),
-                        ],
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
-                  } else {
-                    return const SizedBox();
-                  }
-                },
-              ),
-      ),
+                  );
+                } else {
+                  return CustomScrollView(
+                    slivers: [
+                      HttpError(
+                        errMsg: data['msg'],
+                        fn: () => _followController.queryFollowings('init'),
+                      )
+                    ],
+                  );
+                }
+              } else {
+                // 骨架屏
+                return const SizedBox();
+              }
+            },
+          )),
     );
   }
 }

lib/pages/follow/widgets/follow_item.dart

@@ -1,71 +1,32 @@
 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/models/follow/result.dart';
-import 'package:pilipala/pages/follow/index.dart';
-import 'package:pilipala/pages/video/detail/introduction/widgets/group_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/utils.dart';
 
-class FollowItem extends StatelessWidget {
-  final FollowItemModel item;
-  final FollowController? ctr;
-  const FollowItem({super.key, required this.item, this.ctr});
-
-  @override
-  Widget build(BuildContext context) {
-    String heroTag = Utils.makeHeroTag(item.mid);
-    return ListTile(
-      onTap: () {
-        feedBack();
-        Get.toNamed('/member?mid=${item.mid}',
-            arguments: {'face': item.face, 'heroTag': heroTag});
-      },
-      leading: Hero(
-        tag: heroTag,
-        child: NetworkImgLayer(
-          width: 45,
-          height: 45,
-          type: 'avatar',
-          src: item.face,
-        ),
+Widget followItem({item}) {
+  String heroTag = Utils.makeHeroTag(item!.mid);
+  return ListTile(
+    onTap: () {
+      feedBack();
+      Get.toNamed('/member?mid=${item.mid}',
+          arguments: {'face': item.face, 'heroTag': heroTag});
+    },
+    leading: Hero(
+      tag: heroTag,
+      child: NetworkImgLayer(
+        width: 45,
+        height: 45,
+        type: 'avatar',
+        src: item.face,
       ),
-      title: Text(
-        item.uname!,
-        maxLines: 1,
-        overflow: TextOverflow.ellipsis,
-        style: const TextStyle(fontSize: 14),
-      ),
-      subtitle: Text(
-        item.sign!,
-        maxLines: 1,
-        overflow: TextOverflow.ellipsis,
-      ),
-      dense: true,
-      trailing: ctr!.isOwner.value
-          ? SizedBox(
-              height: 34,
-              child: TextButton(
-                onPressed: () async {
-                  await Get.bottomSheet(
-                    GroupPanel(mid: item.mid!),
-                    isScrollControlled: true,
-                  );
-                },
-                style: TextButton.styleFrom(
-                  padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
-                  foregroundColor: Theme.of(context).colorScheme.outline,
-                  backgroundColor:
-                      Theme.of(context).colorScheme.onInverseSurface, // 设置按钮背景色
-                ),
-                child: const Text(
-                  '已关注',
-                  style: TextStyle(fontSize: 12),
-                ),
-              ),
-            )
-          : const SizedBox(),
-    );
-  }
+    ),
+    title: Text(
+      item.uname,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: const TextStyle(fontSize: 14),
+    ),
+    trailing: const SizedBox(width: 6),
+  );
 }

lib/pages/follow/widgets/follow_list.dart

@@ -1,114 +0,0 @@
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/models/follow/result.dart';
-import 'package:pilipala/pages/follow/index.dart';
-
-import 'follow_item.dart';
-
-class FollowList extends StatefulWidget {
-  final FollowController ctr;
-  const FollowList({
-    super.key,
-    required this.ctr,
-  });
-
-  @override
-  State<FollowList> createState() => _FollowListState();
-}
-
-class _FollowListState extends State<FollowList> {
-  late Future _futureBuilderFuture;
-  final ScrollController scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    _futureBuilderFuture = widget.ctr.queryFollowings('init');
-    scrollController.addListener(
-      () async {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-            widget.ctr.queryFollowings('onLoad');
-          });
-        }
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(() {});
-    scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: () async => await widget.ctr.queryFollowings('init'),
-      child: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            var data = snapshot.data;
-            if (data['status']) {
-              List<FollowItemModel> list = widget.ctr.followList;
-              return Obx(
-                () => list.isNotEmpty
-                    ? ListView.builder(
-                        controller: scrollController,
-                        itemCount: list.length + 1,
-                        itemBuilder: (BuildContext context, int index) {
-                          if (index == list.length) {
-                            return Container(
-                              height:
-                                  MediaQuery.of(context).padding.bottom + 60,
-                              padding: EdgeInsets.only(
-                                  bottom:
-                                      MediaQuery.of(context).padding.bottom),
-                              child: Center(
-                                child: Obx(
-                                  () => Text(
-                                    widget.ctr.loadingText.value,
-                                    style: TextStyle(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .outline,
-                                        fontSize: 13),
-                                  ),
-                                ),
-                              ),
-                            );
-                          } else {
-                            return FollowItem(
-                              item: list[index],
-                              ctr: widget.ctr,
-                            );
-                          }
-                        },
-                      )
-                    : const CustomScrollView(slivers: [NoData()]),
-              );
-            } else {
-              return CustomScrollView(
-                slivers: [
-                  HttpError(
-                    errMsg: data['msg'],
-                    fn: () => widget.ctr.queryFollowings('init'),
-                  )
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return const SizedBox();
-          }
-        },
-      ),
-    );
-  }
-}

lib/pages/follow/widgets/owner_follow_list.dart

@@ -1,134 +0,0 @@
-import 'dart:math';
-
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/no_data.dart';
-import 'package:pilipala/http/member.dart';
-import 'package:pilipala/models/follow/result.dart';
-import 'package:pilipala/models/member/tags.dart';
-import 'package:pilipala/pages/follow/index.dart';
-import 'follow_item.dart';
-
-class OwnerFollowList extends StatefulWidget {
-  final FollowController ctr;
-  final MemberTagItemModel? tagItem;
-  const OwnerFollowList({super.key, required this.ctr, this.tagItem});
-
-  @override
-  State<OwnerFollowList> createState() => _OwnerFollowListState();
-}
-
-class _OwnerFollowListState extends State<OwnerFollowList>
-    with AutomaticKeepAliveClientMixin {
-  late int mid;
-  late Future _futureBuilderFuture;
-  final ScrollController scrollController = ScrollController();
-  int pn = 1;
-  int ps = 20;
-  late MemberTagItemModel tagItem;
-  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    super.initState();
-    mid = widget.ctr.mid;
-    tagItem = widget.tagItem!;
-    _futureBuilderFuture = followUpGroup('init');
-    scrollController.addListener(
-      () async {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('follow', const Duration(seconds: 1), () {
-            followUpGroup('onLoad');
-          });
-        }
-      },
-    );
-  }
-
-  // 获取分组下up
-  Future followUpGroup(type) async {
-    if (type == 'init') {
-      pn = 1;
-    }
-    var res = await MemberHttp.followUpGroup(mid, tagItem.tagid, pn, ps);
-    if (res['status']) {
-      if (res['data'].isNotEmpty) {
-        if (type == 'init') {
-          followList.value = res['data'];
-        } else {
-          followList.addAll(res['data']);
-        }
-        pn += 1;
-      }
-    }
-    return res;
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(() {});
-    scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return RefreshIndicator(
-      onRefresh: () async => await followUpGroup('init'),
-      child: FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            var data = snapshot.data;
-            if (data['status']) {
-              return Obx(
-                () => followList.isNotEmpty
-                    ? ListView.builder(
-                        physics: const AlwaysScrollableScrollPhysics(),
-                        controller: scrollController,
-                        itemCount: followList.length + 1,
-                        itemBuilder: (BuildContext context, int index) {
-                          if (index == followList.length) {
-                            return Container(
-                              height:
-                                  MediaQuery.of(context).padding.bottom + 60,
-                              padding: EdgeInsets.only(
-                                  bottom:
-                                      MediaQuery.of(context).padding.bottom),
-                            );
-                          } else {
-                            return FollowItem(
-                              item: followList[index],
-                              ctr: widget.ctr,
-                            );
-                          }
-                        },
-                      )
-                    : const CustomScrollView(slivers: [NoData()]),
-              );
-            } else {
-              return CustomScrollView(
-                slivers: [
-                  HttpError(
-                    errMsg: data['msg'],
-                    fn: () => widget.ctr.queryFollowings('init'),
-                  )
-                ],
-              );
-            }
-          } else {
-            // 骨架屏
-            return const SizedBox();
-          }
-        },
-      ),
-    );
-  }
-}

lib/pages/history/view.dart

@@ -79,6 +79,13 @@ class _HistoryPageState extends State<HistoryPage> {
             style: Theme.of(context).textTheme.titleMedium,
           ),
           actions: [
+            // TextButton(
+            //   onPressed: () {
+            //     _historyController.enableMultiple.value = true;
+            //     setState(() {});
+            //   },
+            //   child: const Text('多选'),
+            // ),
             IconButton(
               onPressed: () => Get.toNamed('/historySearch'),
               icon: const Icon(Icons.search_outlined),

lib/pages/history/widgets/item.dart

@@ -89,7 +89,7 @@ class HistoryItem extends StatelessWidget {
                   arguments: {
                     'pic': pic,
                     'heroTag': heroTag,
-                    'videoType': SearchType.media_bangumi,
+                    // 'videoType': SearchType.media_bangumi,
                   },
                 );
               } else {
@@ -117,7 +117,7 @@ class HistoryItem extends StatelessWidget {
                   arguments: {
                     'pic': pic,
                     'heroTag': heroTag,
-                    'videoType': SearchType.media_bangumi,
+                    // 'videoType': SearchType.media_bangumi,
                     'bangumiItem': res['data'],
                   },
                 );
@@ -276,7 +276,7 @@ class HistoryItem extends StatelessWidget {
 
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
-  final dynamic ctr;
+  final dynamic? ctr;
   const VideoContent({super.key, required this.videoItem, this.ctr});
 
   @override
@@ -297,8 +297,7 @@ class VideoContent extends StatelessWidget {
               maxLines: videoItem.videos > 1 ? 1 : 2,
               overflow: TextOverflow.ellipsis,
             ),
-            if (videoItem.showTitle != null) ...[
-              const SizedBox(height: 2),
+            if (videoItem.showTitle != null)
               Text(
                 videoItem.showTitle,
                 textAlign: TextAlign.start,
@@ -306,24 +305,21 @@ class VideoContent extends StatelessWidget {
                     fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
                     fontWeight: FontWeight.w400,
                     color: Theme.of(context).colorScheme.outline),
-                maxLines: 1,
+                maxLines: 2,
                 overflow: TextOverflow.ellipsis,
               ),
-            ],
             const Spacer(),
-            if (videoItem.authorName != '')
-              Row(
-                children: [
-                  Text(
-                    videoItem.authorName,
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
+            Row(
+              children: [
+                Text(
+                  videoItem.authorName,
+                  style: TextStyle(
+                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    color: Theme.of(context).colorScheme.outline,
                   ),
-                ],
-              ),
+                ),
+              ],
+            ),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [

lib/pages/home/controller.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/black.dart';
 import 'package:pilipala/models/common/tab_type.dart';
+import 'package:pilipala/models/user/black.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class HomeController extends GetxController with GetTickerProviderStateMixin {
@@ -15,6 +17,13 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   RxBool userLogin = false.obs;
   RxString userFace = ''.obs;
   var userInfo;
+  static Box setting = GStrorage.setting;
+  late List<int> blackMidsList;
+
+  int currentPage = 1;
+  int pageSize = 50;
+  int total = 0;
+  List<BlackListItem> blackList = [BlackListItem()];
 
   @override
   void onInit() {
@@ -51,7 +60,33 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   void updateLoginStatus(val) async {
     userInfo = await userInfoCache.get('userInfoCache');
     userLogin.value = val ?? false;
-    if (val) return;
+    if (val) {
+      // 获取黑名单
+      await queryBlacklist();
+      blackMidsList = blackList.map<int>((e) => e.mid!).toList();
+      setting.put(SettingBoxKey.blackMidsList, blackMidsList);
+      return;
+    }
     userFace.value = userInfo != null ? userInfo.face : '';
   }
+
+  Future queryBlacklist({type = 'init'}) async {
+    if (type == 'init') {
+      currentPage = 1;
+    }
+    var result = await BlackHttp.blackList(pn: currentPage, ps: pageSize);
+    if (result['status']) {
+      if (type == 'init') {
+        blackList = result['data'].list;
+        total = result['data'].total;
+      } else {
+        blackList.addAll(result['data'].list);
+      }
+      currentPage += 1;
+      if (blackList.length < total) {
+        await queryBlacklist(type: 'onLoad');
+      }
+    }
+    return result;
+  }
 }

lib/pages/home/view.dart

@@ -8,7 +8,8 @@ import 'package:pilipala/utils/feed_back.dart';
 import './controller.dart';
 
 class HomePage extends StatefulWidget {
-  const HomePage({Key? key}) : super(key: key);
+  Function? callFn;
+  HomePage({Key? key, this.callFn}) : super(key: key);
 
   @override
   State<HomePage> createState() => _HomePageState();
@@ -25,15 +26,16 @@ class _HomePageState extends State<HomePage>
 
   showUserBottonSheet() {
     feedBack();
-    showModalBottomSheet(
-      context: context,
-      builder: (_) => const SizedBox(
-        height: 450,
-        child: MinePage(),
-      ),
-      clipBehavior: Clip.hardEdge,
-      isScrollControlled: true,
-    );
+    widget.callFn!();
+    // showModalBottomSheet(
+    //   context: context,
+    //   builder: (_) => const SizedBox(
+    //     height: 450,
+    //     child: MinePage(),
+    //   ),
+    //   clipBehavior: Clip.hardEdge,
+    //   isScrollControlled: true,
+    // );
   }
 
   @override
@@ -50,37 +52,6 @@ class _HomePageState extends State<HomePage>
             ctr: _homeController,
             callback: showUserBottonSheet,
           ),
-          const SizedBox(height: 8),
-          SizedBox(
-            width: double.infinity,
-            height: 42,
-            child: Align(
-              alignment: Alignment.center,
-              child: TabBar(
-                controller: _homeController.tabController,
-                tabs: [
-                  for (var i in _homeController.tabs) Tab(text: i['label'])
-                ],
-                isScrollable: true,
-                dividerColor: Colors.transparent,
-                enableFeedback: true,
-                splashBorderRadius: BorderRadius.circular(10),
-                onTap: (value) {
-                  feedBack();
-                  if (_homeController.initialIndex == value) {
-                    _homeController.tabsCtrList[value]().animateToTop();
-                  }
-                  _homeController.initialIndex = value;
-                },
-              ),
-            ),
-          ),
-          Expanded(
-            child: TabBarView(
-              controller: _homeController.tabController,
-              children: _homeController.tabsPageList,
-            ),
-          ),
         ],
       ),
     );
@@ -128,8 +99,6 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
               ),
               child: Row(
                 children: [
-                  const Expanded(child: SearchPage()),
-                  const SizedBox(width: 10),
                   Obx(
                     () => ctr!.userLogin.value
                         ? Stack(
@@ -182,6 +151,8 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
                             ),
                           ),
                   ),
+                  const SizedBox(width: 10),
+                  const Expanded(child: SearchPage()),
                 ],
               ),
             ),

lib/pages/home/widgets/left_drawer.dart

@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:pilipala/pages/media/index.dart';
+import 'package:pilipala/pages/mine/index.dart';
+
+class LeftDrawer extends StatefulWidget {
+  const LeftDrawer({super.key});
+
+  @override
+  State<LeftDrawer> createState() => _LeftDrawerState();
+}
+
+class _LeftDrawerState extends State<LeftDrawer> {
+  @override
+  Widget build(BuildContext context) {
+    return Drawer(
+      width: MediaQuery.of(context).size.width * 0.84,
+      child: const Column(
+        children: [
+          Expanded(child: MinePage()),
+          Expanded(child: MediaPage()),
+        ],
+      ),
+    );
+  }
+}

lib/pages/html/controller.dart

@@ -1,112 +1,19 @@
-import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:hive/hive.dart';
 import 'package:pilipala/http/html.dart';
-import 'package:pilipala/http/reply.dart';
-import 'package:pilipala/models/common/reply_sort_type.dart';
-import 'package:pilipala/models/video/reply/item.dart';
-import 'package:pilipala/utils/feed_back.dart';
-import 'package:pilipala/utils/storage.dart';
 
 class HtmlRenderController extends GetxController {
   late String id;
-  late String dynamicType;
-  late int type;
-  RxInt oid = (-1).obs;
   late Map response;
-  int? floor;
-  int currentPage = 0;
-  bool isLoadingMore = false;
-  RxString noMore = ''.obs;
-  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
-  RxInt acount = 0.obs;
-  final ScrollController scrollController = ScrollController();
-
-  ReplySortType _sortType = ReplySortType.time;
-  RxString sortTypeTitle = ReplySortType.time.titles.obs;
-  RxString sortTypeLabel = ReplySortType.time.labels.obs;
-  Box setting = GStrorage.setting;
 
   @override
   void onInit() {
     super.onInit();
     id = Get.parameters['id']!;
-    dynamicType = Get.parameters['dynamicType']!;
-    type = dynamicType == 'picture' ? 11 : 12;
   }
 
-  // 请求动态内容
-  Future reqHtml(id) async {
-    late dynamic res;
-    if (dynamicType == 'opus' || dynamicType == 'picture') {
-      res = await HtmlHttp.reqHtml(id, dynamicType);
-    } else {
-      res = await HtmlHttp.reqReadHtml(id, dynamicType);
-    }
+  Future reqHtml() async {
+    var res = await HtmlHttp.reqHtml(id);
     response = res;
-    oid.value = res['commentId'];
     return res;
   }
-
-  // 请求评论
-  Future queryReplyList({reqType = 'init'}) async {
-    var res = await ReplyHttp.replyList(
-      oid: oid.value,
-      pageNum: currentPage + 1,
-      type: type,
-      sort: _sortType.index,
-    );
-    if (res['status']) {
-      List<ReplyItemModel> replies = res['data'].replies;
-      acount.value = res['data'].page.acount;
-      if (replies.isNotEmpty) {
-        currentPage++;
-        noMore.value = '加载中...';
-        if (replies.length < 20) {
-          noMore.value = '没有更多了';
-        }
-      } else {
-        noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
-      }
-      if (reqType == 'init') {
-        // 添加置顶回复
-        if (res['data'].upper.top != null) {
-          bool flag = res['data']
-              .topReplies
-              .any((reply) => reply.rpid == res['data'].upper.top.rpid);
-          if (!flag) {
-            replies.insert(0, res['data'].upper.top);
-          }
-        }
-        replies.insertAll(0, res['data'].topReplies);
-        replyList.value = replies;
-      } else {
-        replyList.addAll(replies);
-      }
-    }
-    isLoadingMore = false;
-    return res;
-  }
-
-  // 排序搜索评论
-  queryBySort() {
-    feedBack();
-    switch (_sortType) {
-      case ReplySortType.time:
-        _sortType = ReplySortType.like;
-        break;
-      case ReplySortType.like:
-        _sortType = ReplySortType.reply;
-        break;
-      case ReplySortType.reply:
-        _sortType = ReplySortType.time;
-        break;
-      default:
-    }
-    sortTypeTitle.value = _sortType.titles;
-    sortTypeLabel.value = _sortType.labels;
-    currentPage = 0;
-    replyList.clear();
-    queryReplyList(reqType: 'init');
-  }
 }

lib/pages/html/view.dart

@@ -1,19 +1,7 @@
-import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import 'package:pilipala/common/skeleton/video_reply.dart';
 import 'package:pilipala/common/widgets/html_render.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/models/common/reply_type.dart';
-import 'package:pilipala/pages/mine/index.dart';
-import 'package:pilipala/pages/video/detail/reply/widgets/reply_item.dart';
-import 'package:pilipala/pages/video/detail/replyNew/index.dart';
-import 'package:pilipala/pages/video/detail/replyReply/index.dart';
-import 'package:pilipala/utils/feed_back.dart';
 
 import 'controller.dart';
 
@@ -24,104 +12,16 @@ class HtmlRenderPage extends StatefulWidget {
   State<HtmlRenderPage> createState() => _HtmlRenderPageState();
 }
 
-class _HtmlRenderPageState extends State<HtmlRenderPage>
-    with TickerProviderStateMixin {
-  final HtmlRenderController _htmlRenderCtr = Get.put(HtmlRenderController());
+class _HtmlRenderPageState extends State<HtmlRenderPage> {
+  HtmlRenderController htmlRenderCtr = Get.put(HtmlRenderController());
   late String title;
   late String id;
-  late String url;
-  late String dynamicType;
-  late int type;
-  bool _isFabVisible = true;
-  late Future _futureBuilderFuture;
-  late ScrollController scrollController;
-  late AnimationController fabAnimationCtr;
 
   @override
   void initState() {
     super.initState();
     title = Get.parameters['title']!;
     id = Get.parameters['id']!;
-    url = Get.parameters['url']!;
-    dynamicType = Get.parameters['dynamicType']!;
-    type = dynamicType == 'picture' ? 11 : 12;
-    _futureBuilderFuture = _htmlRenderCtr.reqHtml(id);
-    fabAnimationCtr = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 300),
-    );
-    scrollListener();
-  }
-
-  void scrollListener() {
-    scrollController = _htmlRenderCtr.scrollController;
-    scrollController.addListener(
-      () {
-        // 分页加载
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 300) {
-          EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
-            _htmlRenderCtr.queryReplyList(reqType: 'onLoad');
-          });
-        }
-
-        // 标题
-        // if (scrollController.offset > 55 && !_visibleTitle) {
-        //   _visibleTitle = true;
-        //   titleStreamC.add(true);
-        // } else if (scrollController.offset <= 55 && _visibleTitle) {
-        //   _visibleTitle = false;
-        //   titleStreamC.add(false);
-        // }
-
-        // fab按钮
-        final ScrollDirection direction =
-            scrollController.position.userScrollDirection;
-        if (direction == ScrollDirection.forward) {
-          _showFab();
-        } else if (direction == ScrollDirection.reverse) {
-          _hideFab();
-        }
-      },
-    );
-  }
-
-  void _showFab() {
-    if (!_isFabVisible) {
-      _isFabVisible = true;
-      fabAnimationCtr.forward();
-    }
-  }
-
-  void _hideFab() {
-    if (_isFabVisible) {
-      _isFabVisible = false;
-      fabAnimationCtr.reverse();
-    }
-  }
-
-  void replyReply(replyItem) {
-    int oid = replyItem.oid;
-    int rpid = replyItem.rpid!;
-    Get.to(
-      () => Scaffold(
-        appBar: AppBar(
-          titleSpacing: 0,
-          centerTitle: false,
-          title: Text(
-            '评论详情',
-            style: Theme.of(context).textTheme.titleMedium,
-          ),
-        ),
-        body: VideoReplyReplyPanel(
-          oid: oid,
-          rpid: rpid,
-          source: 'dynamic',
-          replyType: ReplyType.values[type],
-          firstFloor: replyItem,
-        ),
-      ),
-    );
   }
 
   @override
@@ -129,328 +29,88 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
     return Scaffold(
       appBar: AppBar(
         centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          title,
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-        actions: [
-          const SizedBox(width: 4),
-          IconButton(
-            onPressed: () {
-              Get.toNamed('/webview', parameters: {
-                'url': url.startsWith('http') ? url : 'https:$url',
-                'type': 'url',
-                'pageTitle': title,
-              });
-            },
-            icon: const Icon(Icons.open_in_browser_outlined, size: 19),
-          ),
-          PopupMenuButton(
-            icon: const Icon(Icons.more_vert),
-            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-              PopupMenuItem(
-                onTap: () => {
-                  Clipboard.setData(ClipboardData(text: url)),
-                  SmartDialog.showToast('已复制'),
-                },
-                child: const Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.copy_rounded, size: 19),
-                    SizedBox(width: 10),
-                    Text('复制链接'),
-                  ],
-                ),
-              ),
-              PopupMenuItem(
-                onTap: () => {},
-                child: const Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.share_outlined, size: 19),
-                    SizedBox(width: 10),
-                    Text('分享'),
-                  ],
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(width: 6)
-        ],
+        title: Text(title),
       ),
-      body: Stack(
-        children: [
-          SingleChildScrollView(
-            controller: scrollController,
-            child: Column(
-              children: [
-                FutureBuilder(
-                  future: _futureBuilderFuture,
-                  builder: (context, snapshot) {
-                    if (snapshot.connectionState == ConnectionState.done) {
-                      var data = snapshot.data;
-                      fabAnimationCtr.forward();
-                      if (data['status']) {
-                        return Column(
-                          children: [
-                            Padding(
-                              padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
-                              child: Row(
+      body: SingleChildScrollView(
+        child: Column(
+          children: [
+            FutureBuilder(
+              future: htmlRenderCtr.reqHtml(),
+              builder: (context, snapshot) {
+                if (snapshot.connectionState == ConnectionState.done) {
+                  var data = snapshot.data;
+                  if (data['status']) {
+                    return Column(
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
+                          child: Row(
+                            children: [
+                              NetworkImgLayer(
+                                width: 40,
+                                height: 40,
+                                type: 'avatar',
+                                src: htmlRenderCtr.response['avatar']!,
+                              ),
+                              const SizedBox(width: 10),
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  NetworkImgLayer(
-                                    width: 40,
-                                    height: 40,
-                                    type: 'avatar',
-                                    src: _htmlRenderCtr.response['avatar']!,
+                                  Text(htmlRenderCtr.response['uname'],
+                                      style: TextStyle(
+                                        fontSize: Theme.of(context)
+                                            .textTheme
+                                            .titleSmall!
+                                            .fontSize,
+                                      )),
+                                  Text(
+                                    htmlRenderCtr.response['updateTime'],
+                                    style: TextStyle(
+                                      color:
+                                          Theme.of(context).colorScheme.outline,
+                                      fontSize: Theme.of(context)
+                                          .textTheme
+                                          .labelSmall!
+                                          .fontSize,
+                                    ),
                                   ),
-                                  const SizedBox(width: 10),
-                                  Column(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
-                                    children: [
-                                      Text(_htmlRenderCtr.response['uname'],
-                                          style: TextStyle(
-                                            fontSize: Theme.of(context)
-                                                .textTheme
-                                                .titleSmall!
-                                                .fontSize,
-                                          )),
-                                      Text(
-                                        _htmlRenderCtr.response['updateTime'],
-                                        style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .outline,
-                                          fontSize: Theme.of(context)
-                                              .textTheme
-                                              .labelSmall!
-                                              .fontSize,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                  const Spacer(),
                                 ],
                               ),
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.fromLTRB(12, 8, 12, 8),
-                              child: HtmlRender(
-                                htmlContent: _htmlRenderCtr.response['content'],
-                              ),
-                            ),
-                            Container(
-                              decoration: BoxDecoration(
-                                border: Border(
-                                  bottom: BorderSide(
-                                    width: 8,
-                                    color: Theme.of(context)
-                                        .dividerColor
-                                        .withOpacity(0.05),
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ],
-                        );
-                      } else {
-                        return const Text('error');
-                      }
-                    } else {
-                      // 骨架屏
-                      return const SizedBox();
-                    }
-                  },
-                ),
-                Obx(
-                  () => _htmlRenderCtr.oid.value != -1
-                      ? Container(
+                              const Spacer(),
+                            ],
+                          ),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
+                          child: HtmlRender(
+                            htmlContent: htmlRenderCtr.response['content'],
+                          ),
+                        ),
+                        Container(
                           decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.surface,
                             border: Border(
-                              top: BorderSide(
-                                width: 0.6,
+                              bottom: BorderSide(
+                                width: 8,
                                 color: Theme.of(context)
                                     .dividerColor
                                     .withOpacity(0.05),
                               ),
                             ),
                           ),
-                          height: 45,
-                          padding: const EdgeInsets.only(left: 12, right: 6),
-                          child: Row(
-                            children: [
-                              const Text('回复'),
-                              const Spacer(),
-                              SizedBox(
-                                height: 35,
-                                child: TextButton.icon(
-                                  onPressed: () => _htmlRenderCtr.queryBySort(),
-                                  icon: const Icon(Icons.sort, size: 16),
-                                  label: Obx(
-                                    () => Text(
-                                      _htmlRenderCtr.sortTypeLabel.value,
-                                      style: const TextStyle(fontSize: 13),
-                                    ),
-                                  ),
-                                ),
-                              )
-                            ],
-                          ),
-                        )
-                      : const SizedBox(),
-                ),
-                Obx(
-                  () => _htmlRenderCtr.oid.value != -1
-                      ? FutureBuilder(
-                          future: _htmlRenderCtr.queryReplyList(),
-                          builder: (context, snapshot) {
-                            if (snapshot.connectionState ==
-                                ConnectionState.done) {
-                              Map data = snapshot.data as Map;
-                              if (snapshot.data['status']) {
-                                // 请求成功
-                                return Obx(
-                                  () => _htmlRenderCtr.replyList.isEmpty &&
-                                          _htmlRenderCtr.isLoadingMore
-                                      ? ListView.builder(
-                                          itemCount: 5,
-                                          shrinkWrap: true,
-                                          physics:
-                                              const NeverScrollableScrollPhysics(),
-                                          itemBuilder: (context, index) {
-                                            return const VideoReplySkeleton();
-                                          },
-                                        )
-                                      : ListView.builder(
-                                          shrinkWrap: true,
-                                          physics:
-                                              const NeverScrollableScrollPhysics(),
-                                          itemCount:
-                                              _htmlRenderCtr.replyList.length +
-                                                  1,
-                                          itemBuilder: (context, index) {
-                                            if (index ==
-                                                _htmlRenderCtr
-                                                    .replyList.length) {
-                                              return Container(
-                                                padding: EdgeInsets.only(
-                                                    bottom:
-                                                        MediaQuery.of(context)
-                                                            .padding
-                                                            .bottom),
-                                                height: MediaQuery.of(context)
-                                                        .padding
-                                                        .bottom +
-                                                    100,
-                                                child: Center(
-                                                  child: Obx(
-                                                    () => Text(
-                                                      _htmlRenderCtr
-                                                          .noMore.value,
-                                                      style: TextStyle(
-                                                        fontSize: 12,
-                                                        color: Theme.of(context)
-                                                            .colorScheme
-                                                            .outline,
-                                                      ),
-                                                    ),
-                                                  ),
-                                                ),
-                                              );
-                                            } else {
-                                              return ReplyItem(
-                                                replyItem: _htmlRenderCtr
-                                                    .replyList[index],
-                                                showReplyRow: true,
-                                                replyLevel: '1',
-                                                replyReply: (replyItem) =>
-                                                    replyReply(replyItem),
-                                                replyType:
-                                                    ReplyType.values[type],
-                                                addReply: (replyItem) {
-                                                  _htmlRenderCtr
-                                                      .replyList[index].replies!
-                                                      .add(replyItem);
-                                                },
-                                              );
-                                            }
-                                          },
-                                        ),
-                                );
-                              } else {
-                                // 请求错误
-                                return CustomScrollView(
-                                  slivers: [
-                                    HttpError(
-                                      errMsg: data['msg'],
-                                      fn: () => setState(() {}),
-                                    )
-                                  ],
-                                );
-                              }
-                            } else {
-                              // 骨架屏
-                              return ListView.builder(
-                                shrinkWrap: true,
-                                physics: const NeverScrollableScrollPhysics(),
-                                itemCount: 5,
-                                itemBuilder: (context, index) {
-                                  return const VideoReplySkeleton();
-                                },
-                              );
-                            }
-                          },
-                        )
-                      : const SizedBox(),
-                )
-              ],
+                        ),
+                      ],
+                    );
+                  } else {
+                    return Text('error');
+                  }
+                } else {
+                  // 骨架屏
+                  return const SizedBox();
+                }
+              },
             ),
-          ),
-          Positioned(
-            bottom: MediaQuery.of(context).padding.bottom + 14,
-            right: 14,
-            child: SlideTransition(
-              position: Tween<Offset>(
-                begin: const Offset(0, 2),
-                end: const Offset(0, 0),
-              ).animate(CurvedAnimation(
-                parent: fabAnimationCtr,
-                curve: Curves.easeInOut,
-              )),
-              child: FloatingActionButton(
-                heroTag: null,
-                onPressed: () {
-                  feedBack();
-                  showModalBottomSheet(
-                    context: context,
-                    isScrollControlled: true,
-                    builder: (BuildContext context) {
-                      return VideoReplyNewDialog(
-                        oid: _htmlRenderCtr.oid.value,
-                        root: 0,
-                        parent: 0,
-                        replyType: ReplyType.values[type],
-                      );
-                    },
-                  ).then(
-                    (value) => {
-                      // 完成评论，数据添加
-                      if (value != null && value['data'] != null)
-                        {
-                          _htmlRenderCtr.replyList.add(value['data']),
-                          _htmlRenderCtr.acount.value++
-                        }
-                    },
-                  );
-                },
-                tooltip: '评论动态',
-                child: const Icon(Icons.reply),
-              ),
-            ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }