v1.0.14 更新

Refactor danmaku controller

.github/workflows/main.yml

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

android/app/build.gradle

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

change_log/1.0.13.1217.md

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

change_log/1.0.14.1225.md

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

ios/Podfile

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

ios/Podfile.lock

@@ -1,6 +1,12 @@
 PODS:
   - appscheme (1.0.4):
     - Flutter
+  - audio_service (0.0.1):
+    - Flutter
+  - audio_session (0.0.1):
+    - Flutter
+  - auto_orientation (0.0.1):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
@@ -56,6 +62,9 @@ PODS:
 
 DEPENDENCIES:
   - appscheme (from `.symlinks/plugins/appscheme/ios`)
+  - audio_service (from `.symlinks/plugins/audio_service/ios`)
+  - audio_session (from `.symlinks/plugins/audio_session/ios`)
+  - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
@@ -88,6 +97,12 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   appscheme:
     :path: ".symlinks/plugins/appscheme/ios"
+  audio_service:
+    :path: ".symlinks/plugins/audio_service/ios"
+  audio_session:
+    :path: ".symlinks/plugins/audio_session/ios"
+  auto_orientation:
+    :path: ".symlinks/plugins/auto_orientation/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
@@ -135,8 +150,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8
+  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
+  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
+  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -145,22 +163,22 @@ SPEC CHECKSUMS:
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
   system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
-PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
+PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

ios/Runner.xcodeproj/project.pbxproj

@@ -121,7 +121,6 @@
 				3DA6FBBC55FDD1E3261D6D67 /* Pods-Runner.release.xcconfig */,
 				32E2926120A1A8DC0E629BC6 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -157,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -361,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -377,7 +376,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -439,7 +438,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -488,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -506,7 +505,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -529,7 +528,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = RN352BA826;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

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

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

ios/Runner/Base.lproj/Main.storyboard

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

lib/common/constants.dart

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

lib/common/widgets/badge.dart

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

lib/common/widgets/content_container.dart

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

lib/common/widgets/video_card_h.dart

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

lib/common/widgets/video_card_v.dart

@@ -333,8 +333,10 @@ class VideoStat extends StatelessWidget {
           color: Theme.of(context).colorScheme.outline,
         ),
         children: [
-          TextSpan(text: '${videoItem.stat.view}观看'),
+          if (videoItem.stat.view != '-')
-          TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
+            TextSpan(text: '${videoItem.stat.view}观看'),
+          if (videoItem.stat.danmu != '-')
+            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
         ],
       ),
     );

lib/http/api.dart

@@ -97,8 +97,8 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
-  // 相互关系查询
+  // 相互关系查询 // 失效
-  static const String relationSearch = '/x/space/wbi/acc/relation';
+  // 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
@@ -215,7 +215,7 @@ class Api {
   // 粉丝
   // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
   // order_type 排序规则 最近访问传空，最常访问传 attention
-  static const String fans = 'https://api.bilibili.com/x/relation/fans';
+  static const String fans = '/x/relation/fans';
 
   // 直播
   // ?page=1&page_size=30&platform=web
@@ -312,6 +312,10 @@ class Api {
 
   static const String webDanmaku = '/x/v2/dm/web/seg.so';
 
+  //发送视频弹幕
+  //https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/danmaku/action.md
+  static const String shootDanmaku = '/x/v2/dm/post';
+
   // up主分组
   static const String followUpTag = '/x/relation/tags';
 
@@ -322,6 +326,51 @@ class Api {
   // 获取指定分组下的up
   static const String followUpGroup = '/x/relation/tag';
 
+  /// 私聊
+  ///  'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions?
+  /// session_type=1&
+  /// group_fold=1&
+  /// unfollow_fold=0&
+  /// sort_rule=2&
+  /// build=0&
+  /// mobi_app=web&
+  /// w_rid=8641d157fb9a9255eb2159f316ee39e2&
+  /// wts=1697305010
+
+  static const String sessionList =
+      'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions';
+
+  /// 私聊用户信息
+  /// uids
+  /// build=0&mobi_app=web
+  static const String sessionAccountList =
+      'https://api.vc.bilibili.com/account/v1/user/cards';
+
+  /// https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs?
+  /// talker_id=400787461&
+  /// session_type=1&
+  /// size=20&
+  /// sender_device_id=1&
+  /// build=0&
+  /// mobi_app=web&
+  /// web_location=333.1296&
+  /// w_rid=cfe3bf58c9fe181bbf4dd6c75175e6b0&
+  /// wts=1697350697
+
+  static const String sessionMsg =
+      'https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs';
+
+  /// 标记已读 POST
+  /// talker_id:
+  /// session_type: 1
+  /// ack_seqno: 920224140918926
+  /// build: 0
+  /// mobi_app: web
+  /// csrf_token:
+  /// csrf:
+  static const String updateAck =
+      'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack';
+
   // 获取某个动态详情
   // timezone_offset=-480
   // id=849312409672744983
@@ -372,4 +421,49 @@ class Api {
   /// local_id
   static const getWebKey =
       'https://passport.bilibili.com/x/passport-login/web/key';
+
+  /// cookie转access_key
+  static const cookieToKey =
+      'https://passport.bilibili.com/x/passport-tv-login/h5/qrcode/confirm';
+
+  /// 申请二维码(TV端)
+  static const getTVCode =
+      'https://passport.snm0516.aisee.tv/x/passport-tv-login/qrcode/auth_code';
+
+  ///扫码登录（TV端）
+  static const qrcodePoll =
+      'https://passport.bilibili.com/x/passport-tv-login/qrcode/poll';
+
+  /// 置顶视频
+  static const getTopVideoApi = '/x/space/top/arc';
+
+  /// 主页 - 最近投币的视频
+  /// vmid
+  /// gaia_source = main_web
+  /// web_location
+  /// w_rid
+  /// wts
+  static const getRecentCoinVideoApi = '/x/space/coin/video';
+
+  /// 最近点赞的视频
+  static const getRecentLikeVideoApi = '/x/space/like/video';
+
+  /// 最近追番
+  static const getRecentBangumiApi = '/x/space/bangumi/follow/list';
+
+  /// 用户专栏
+  static const getMemberSeasonsApi = '/x/polymer/web-space/home/seasons_series';
+
+  /// 获赞数 播放数
+  /// mid
+  static const getMemberViewApi = '/x/space/upstat';
+
+  /// 查询某个专栏
+  /// mid
+  /// season_id
+  /// sort_reverse
+  /// page_num
+  /// page_size
+  static const getSeasonDetailApi =
+      '/x/polymer/web-space/seasons_archives_list';
 }

lib/http/danmaku.dart

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

lib/http/member.dart

@@ -1,9 +1,16 @@
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/models/member/archive.dart';
+import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/models/member/info.dart';
+import 'package:pilipala/models/member/seasons.dart';
 import 'package:pilipala/models/member/tags.dart';
+import 'package:pilipala/utils/storage.dart';
+import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/wbi_sign.dart';
 
 class MemberHttp {
@@ -215,4 +222,243 @@ class MemberHttp {
       };
     }
   }
+
+  // 获取up置顶
+  static Future getTopVideo(String? vmid) async {
+    var res = await Request().get(Api.getTopVideoApi);
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberTagItemModel>((e) => MemberTagItemModel.fromJson(e))
+            .toList()
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取uo专栏
+  static Future getMemberSeasons(int? mid, int? pn, int? ps) async {
+    var res = await Request().get(Api.getMemberSeasonsApi, data: {
+      'mid': mid,
+      'page_num': pn,
+      'page_size': ps,
+    });
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 最近投币
+  static Future getRecentCoinVideo({required int mid}) async {
+    Map params = await WbiSign().makSign({
+      'mid': mid,
+      'gaia_source': 'main_web',
+      'web_location': 333.999,
+    });
+    var res = await Request().get(
+      Api.getRecentCoinVideoApi,
+      data: {
+        'vmid': mid,
+        'gaia_source': 'main_web',
+        'web_location': 333.999,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']
+            .map<MemberCoinsDataModel>((e) => MemberCoinsDataModel.fromJson(e))
+            .toList(),
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 最近点赞
+  static Future getRecentLikeVideo({required int mid}) async {
+    Map params = await WbiSign().makSign({
+      'mid': mid,
+      'gaia_source': 'main_web',
+      'web_location': 333.999,
+    });
+    var res = await Request().get(
+      Api.getRecentLikeVideoApi,
+      data: {
+        'vmid': mid,
+        'gaia_source': 'main_web',
+        'web_location': 333.999,
+        'w_rid': params['w_rid'],
+        'wts': params['wts'],
+      },
+    );
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': MemberSeasonsDataModel.fromJson(res.data['data']['items_lists'])
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 查看某个专栏
+  static Future getSeasonDetail({
+    required int mid,
+    required int seasonId,
+    bool sortReverse = false,
+    required int pn,
+    required int ps,
+  }) async {
+    var res = await Request().get(
+      Api.getSeasonDetailApi,
+      data: {
+        'mid': mid,
+        'season_id': seasonId,
+        'sort_reverse': sortReverse,
+        'page_num': pn,
+        'page_size': ps,
+      },
+    );
+    if (res.data['code'] == 0) {
+      try {
+        return {
+          'status': true,
+          'data': MemberSeasonsList.fromJson(res.data['data'])
+        };
+      } catch (err) {
+        print(err);
+      }
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取TV authCode
+  static Future getTVCode() async {
+    SmartDialog.showLoading();
+    var params = {
+      'appkey': Constants.appKey,
+      'local_id': '0',
+      'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(),
+    };
+    String sign = Utils.appSign(
+      params,
+      Constants.appKey,
+      Constants.appSec,
+    );
+    var res = await Request()
+        .post(Api.getTVCode, queryParameters: {...params, 'sign': sign});
+    if (res.data['code'] == 0) {
+      return {
+        'status': true,
+        'data': res.data['data']['auth_code'],
+        'msg': '操作成功'
+      };
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取access_key
+  static Future cookieToKey() async {
+    var authCodeRes = await getTVCode();
+    if (authCodeRes['status']) {
+      var res = await Request().post(Api.cookieToKey, queryParameters: {
+        'auth_code': authCodeRes['data'],
+        'build': 708200,
+        'csrf': await Request.getCsrf(),
+      });
+      await Future.delayed(const Duration(milliseconds: 300));
+      await qrcodePoll(authCodeRes['data']);
+      if (res.data['code'] == 0) {
+        return {'status': true, 'data': [], 'msg': '操作成功'};
+      } else {
+        return {
+          'status': false,
+          'data': [],
+          'msg': res.data['message'],
+        };
+      }
+    }
+  }
+
+  static Future qrcodePoll(authCode) async {
+    var params = {
+      'appkey': Constants.appKey,
+      'auth_code': authCode.toString(),
+      'local_id': '0',
+      'ts': (DateTime.now().millisecondsSinceEpoch ~/ 1000).toString(),
+    };
+    String sign = Utils.appSign(
+      params,
+      Constants.appKey,
+      Constants.appSec,
+    );
+    var res = await Request()
+        .post(Api.qrcodePoll, queryParameters: {...params, 'sign': sign});
+    SmartDialog.dismiss();
+    if (res.data['code'] == 0) {
+      String accessKey = res.data['data']['access_token'];
+      Box localCache = GStrorage.localCache;
+      Box userInfoCache = GStrorage.userInfo;
+      var userInfo = userInfoCache.get('userInfoCache');
+      localCache.put(
+          LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey});
+      return {'status': true, 'data': [], 'msg': '操作成功'};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+
+  // 获取up播放数、点赞数
+  static Future memberView({required int mid}) async {
+    var res = await Request().get(Api.getMemberViewApi, data: {'mid': mid});
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
 }

lib/http/msg.dart

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

lib/http/user.dart

@@ -199,7 +199,7 @@ class UserHttp {
     }
   }
 
-  // 获取用户凭证
+  // 获取用户凭证 失效
   static Future thirdLogin() async {
     var res = await Request().get(
       'https://passport.bilibili.com/login/app/third',
@@ -251,30 +251,43 @@ class UserHttp {
     }
   }
 
-  // 相互关系查询
+  static Future hasFollow(int mid) async {
-  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,
+      Api.hasFollow,
       data: {
-        'mid': mid,
+        'fid': 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 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(

lib/models/home/rcmd/result.dart

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

lib/models/member/coin.dart

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

lib/models/member/seasons.dart

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

lib/models/model_rec_video_item.dart

@@ -36,7 +36,7 @@ class RecVideoItemModel {
   @HiveField(6)
   String? title = '';
   @HiveField(7)
-  int? duration = -1;
+  String? duration = '';
   @HiveField(8)
   int? pubdate = -1;
   @HiveField(9)
@@ -56,7 +56,7 @@ class RecVideoItemModel {
     uri = json["uri"];
     pic = json["pic"];
     title = json["title"];
-    duration = json["duration"];
+    duration = json["duration"].toString();
     pubdate = json["pubdate"];
     owner = Owner.fromJson(json["owner"]);
     stat = Stat.fromJson(json["stat"]);
@@ -72,19 +72,19 @@ class Stat {
   Stat({
     this.view,
     this.like,
-    this.danmaku,
+    this.danmu,
   });
   @HiveField(0)
   int? view;
   @HiveField(1)
   int? like;
   @HiveField(2)
-  int? danmaku;
+  int? danmu;
 
   Stat.fromJson(Map<String, dynamic> json) {
     view = json["view"];
     like = json["like"];
-    danmaku = json['danmaku'];
+    danmu = json['danmaku'];
   }
 }
 

lib/models/model_rec_video_item.g.dart

@@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
       uri: fields[4] as String?,
       pic: fields[5] as String?,
       title: fields[6] as String?,
-      duration: fields[7] as int?,
+      duration: fields[7] as String?,
       pubdate: fields[8] as int?,
       owner: fields[9] as Owner?,
       stat: fields[10] as Stat?,
@@ -89,7 +89,7 @@ class StatAdapter extends TypeAdapter<Stat> {
     return Stat(
       view: fields[0] as int?,
       like: fields[1] as int?,
-      danmaku: fields[2] as int?,
+      danmu: fields[2] as int?,
     );
   }
 
@@ -102,7 +102,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       ..writeByte(1)
       ..write(obj.like)
       ..writeByte(2)
-      ..write(obj.danmaku);
+      ..write(obj.danmu);
   }
 
   @override

lib/models/msg/account.dart

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

lib/models/msg/session.dart

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

lib/models/video/play/url.dart

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

lib/pages/about/index.dart

@@ -1,6 +1,3 @@
-import 'dart:io';
-
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -34,11 +31,6 @@ class _AboutPageState extends State<AboutPage> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Divider(
-              thickness: 8,
-              height: 10,
-              color: Theme.of(context).colorScheme.onInverseSurface,
-            ),
             Image.asset(
               'assets/images/logo/logo_android_2.png',
               width: 150,
@@ -83,9 +75,9 @@ class _AboutPageState extends State<AboutPage> {
             //   ),
             // ),
             Divider(
-              thickness: 8,
+              thickness: 1,
               height: 30,
-              color: Theme.of(context).colorScheme.onInverseSurface,
+              color: Theme.of(context).colorScheme.outlineVariant,
             ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
@@ -134,11 +126,6 @@ class _AboutPageState extends State<AboutPage> {
               title: const Text('赞助'),
               trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
-            Divider(
-              thickness: 8,
-              height: 30,
-              color: Theme.of(context).colorScheme.onInverseSurface,
-            ),
           ],
         ),
       ),

lib/pages/bangumi/introduction/view.dart

@@ -5,7 +5,6 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/badge.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/common/widgets/stat/danmu.dart';
 import 'package:pilipala/common/widgets/stat/view.dart';
@@ -122,7 +121,14 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -396,7 +402,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.thumbsUp),
                       selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap: () => bangumiIntroController.actionLikeVideo(),
+                      onTap: handleState(bangumiIntroController.actionLikeVideo),
                       selectStatus: bangumiIntroController.hasLike.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -407,7 +413,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.b),
                       selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap: () => bangumiIntroController.actionCoinVideo(),
+                      onTap: handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
                       loadingStatus: false,
                       text: !widget.loadingStatus
@@ -456,7 +462,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: () => videoIntroController.actionLikeVideo(),
+          onTap: handleState(videoIntroController.actionLikeVideo),
           selectStatus: videoIntroController.hasLike.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus
@@ -468,7 +474,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.b),
-          onTap: () => videoIntroController.actionCoinVideo(),
+          onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: widget.loadingStatus,
           text: !widget.loadingStatus

lib/pages/bangumi/view.dart

@@ -6,6 +6,7 @@ import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
+import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/rcmd/view.dart';
 
@@ -35,6 +36,8 @@ class _BangumiPageState extends State<BangumiPage>
     scrollController = _bangumidController.scrollController;
     StreamController<bool> mainStream =
         Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
     _futureBuilderFuture = _bangumidController.queryBangumiListFeed();
     _futureBuilderFutureFollow = _bangumidController.queryBangumiFollow();
     scrollController.addListener(
@@ -51,8 +54,10 @@ class _BangumiPageState extends State<BangumiPage>
             scrollController.position.userScrollDirection;
         if (direction == ScrollDirection.forward) {
           mainStream.add(true);
+          searchBarStream.add(true);
         } else if (direction == ScrollDirection.reverse) {
           mainStream.add(false);
+          searchBarStream.add(false);
         }
       },
     );

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -5,6 +5,7 @@ import 'package:hive/hive.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 class BangumiPanel extends StatefulWidget {
   final List<EpisodeItem> pages;
@@ -35,6 +36,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
   late int cid;
   String heroTag = Get.arguments['heroTag'];
   late final VideoDetailController videoDetailCtr;
+  final ItemScrollController itemScrollController = ItemScrollController();
 
   @override
   void initState() {
@@ -70,10 +72,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
         return StatefulBuilder(
           builder: (BuildContext context, StateSetter setState) {
             WidgetsBinding.instance.addPostFrameCallback((_) async {
-              await Future.delayed(const Duration(milliseconds: 200));
+              // await Future.delayed(const Duration(milliseconds: 200));
-              listViewScrollCtr_2.animateTo(currentIndex * 56,
+              // listViewScrollCtr_2.animateTo(currentIndex * 56,
-                  duration: const Duration(milliseconds: 500),
+              //     duration: const Duration(milliseconds: 500),
-                  curve: Curves.easeInOut);
+              //     curve: Curves.easeInOut);
+              itemScrollController.jumpTo(index: currentIndex);
             });
             // 在这里使用 setState 更新状态
             return Container(
@@ -101,42 +104,39 @@ class _BangumiPanelState extends State<BangumiPanel> {
                   ),
                   Expanded(
                     child: Material(
-                      child: ListView.builder(
+                      child: ScrollablePositionedList.builder(
-                        controller: listViewScrollCtr_2,
                         itemCount: widget.pages.length,
-                        itemBuilder: (context, index) {
+                        itemBuilder: (context, index) => ListTile(
-                          return ListTile(
+                          onTap: () {
-                            onTap: () {
+                            setState(() {
-                              setState(() {
+                              changeFucCall(widget.pages[index], index);
-                                changeFucCall(widget.pages[index], index);
+                            });
-                              });
+                          },
-                            },
+                          dense: false,
-                            dense: false,
+                          leading: index == currentIndex
-                            leading: index == currentIndex
+                              ? Image.asset(
-                                ? Image.asset(
+                                  'assets/images/live.gif',
-                                    'assets/images/live.gif',
+                                  color: Theme.of(context).colorScheme.primary,
-                                    color:
+                                  height: 12,
-                                        Theme.of(context).colorScheme.primary,
+                                )
-                                    height: 12,
+                              : null,
-                                  )
+                          title: Text(
-                                : null,
+                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
-                            title: Text(
+                            style: TextStyle(
-                              '第${index + 1}话  ${widget.pages[index].longTitle!}',
+                              fontSize: 14,
-                              style: TextStyle(
+                              color: index == currentIndex
-                                fontSize: 14,
+                                  ? Theme.of(context).colorScheme.primary
-                                color: index == currentIndex
+                                  : Theme.of(context).colorScheme.onSurface,
-                                    ? Theme.of(context).colorScheme.primary
-                                    : Theme.of(context).colorScheme.onSurface,
-                              ),
                             ),
-                            trailing: widget.pages[index].badge != null
+                          ),
-                                ? Image.asset(
+                          trailing: widget.pages[index].badge != null
-                                    'assets/images/big-vip.png',
+                              ? Image.asset(
-                                    height: 20,
+                                  'assets/images/big-vip.png',
-                                  )
+                                  height: 20,
-                                : const SizedBox(),
+                                )
-                          );
+                              : const SizedBox(),
-                        },
+                        ),
+                        itemScrollController: itemScrollController,
                       ),
                     ),
                   ),
@@ -236,7 +236,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               children: [
                                 if (i == currentIndex) ...[
                                   Image.asset(
-                                    'assets/images/live.gif',
+                                    'assets/images/live.png',
                                     color:
                                         Theme.of(context).colorScheme.primary,
                                     height: 12,

lib/pages/danmaku/controller.dart

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

lib/pages/danmaku/view.dart

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

lib/pages/dynamics/widgets/action_panel.dart

@@ -23,7 +23,14 @@ class ActionPanel extends StatefulWidget {
 class _ActionPanelState extends State<ActionPanel> {
   final DynamicsController _dynamicsController = Get.put(DynamicsController());
   late ModuleStatModel stat;
-
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -31,7 +38,7 @@ class _ActionPanelState extends State<ActionPanel> {
   }
 
   // 动态点赞
-  onLikeDynamic() async {
+  Future onLikeDynamic() async {
     feedBack();
     var item = widget.item!;
     String dynamicId = item.idStr!;
@@ -101,7 +108,7 @@ class _ActionPanelState extends State<ActionPanel> {
         Expanded(
           flex: 1,
           child: TextButton.icon(
-            onPressed: () => onLikeDynamic(),
+            onPressed: handleState(onLikeDynamic),
             icon: Icon(
               stat.like!.status!
                   ? FontAwesomeIcons.solidThumbsUp

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/pages/preview/index.dart';
 
 // 富文本
 InlineSpan richNode(item, context) {
@@ -11,13 +9,11 @@ InlineSpan richNode(item, context) {
     TextStyle authorStyle =
         TextStyle(color: Theme.of(context).colorScheme.primary);
     List<InlineSpan> spanChilds = [];
-    String contentType = 'desc';
 
     dynamic richTextNodes;
     if (item.modules.moduleDynamic.desc != null) {
       richTextNodes = item.modules.moduleDynamic.desc.richTextNodes;
     } else if (item.modules.moduleDynamic.major != null) {
-      contentType = 'major';
       // 动态页面 richTextNodes 层级可能与主页动态层级不同
       richTextNodes =
           item.modules.moduleDynamic.major.opus.summary.richTextNodes;

lib/pages/fan/controller.dart

@@ -15,6 +15,7 @@ class FansController extends GetxController {
   late String name;
   var userInfo;
   RxString loadingText = '加载中...'.obs;
+  RxBool isOwner = false.obs;
 
   @override
   void onInit() {
@@ -23,6 +24,7 @@ class FansController extends GetxController {
     mid = Get.parameters['mid'] != null
         ? int.parse(Get.parameters['mid']!)
         : userInfo.mid;
+    isOwner.value = mid == userInfo.mid;
     name = Get.parameters['name'] ?? userInfo.uname;
   }
 

lib/pages/fan/view.dart

@@ -54,7 +54,7 @@ class _FansPageState extends State<FansPage> {
         centerTitle: false,
         titleSpacing: 0,
         title: Text(
-          '${_fansController.name}的粉丝',
+          _fansController.isOwner.value ? '我的粉丝' : '${_fansController.name}的粉丝',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),

lib/pages/follow/widgets/follow_item.dart

@@ -1,5 +1,4 @@
 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';

lib/pages/follow/widgets/owner_follow_list.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';

lib/pages/history/widgets/item.dart

@@ -11,7 +11,6 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/common/business_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/live/item.dart';
-import 'package:pilipala/pages/history/index.dart';
 import 'package:pilipala/pages/history_search/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';

lib/pages/history_search/view.dart

@@ -131,7 +131,6 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
                                             onChoose: null,
                                             onUpdateMultiple: () => null,
                                           );
-                                          ;
                                         }
                                       },
                                     )

lib/pages/home/controller.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -15,6 +17,10 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   RxBool userLogin = false.obs;
   RxString userFace = ''.obs;
   var userInfo;
+  Box setting = GStrorage.setting;
+  late final StreamController<bool> searchBarStream =
+      StreamController<bool>.broadcast();
+  late bool hideSearchBar;
 
   @override
   void onInit() {
@@ -33,6 +39,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
       length: tabs.length,
       vsync: this,
     );
+    hideSearchBar =
+        setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
   }
 
   void onRefresh() {

lib/pages/home/view.dart

@@ -1,7 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/mine/index.dart';
 import 'package:pilipala/pages/search/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
@@ -18,11 +19,17 @@ class _HomePageState extends State<HomePage>
     with AutomaticKeepAliveClientMixin, TickerProviderStateMixin {
   final HomeController _homeController = Get.put(HomeController());
   List videoList = [];
-  Stream<bool> stream = Get.find<MainController>().bottomBarStream.stream;
+  late Stream<bool> stream;
 
   @override
   bool get wantKeepAlive => true;
 
+  @override
+  void initState() {
+    super.initState();
+    stream = _homeController.searchBarStream.stream;
+  }
+
   showUserBottonSheet() {
     feedBack();
     showModalBottomSheet(
@@ -46,7 +53,9 @@ class _HomePageState extends State<HomePage>
       body: Column(
         children: [
           CustomAppBar(
-            stream: stream,
+            stream: _homeController.hideSearchBar
+                ? stream
+                : StreamController<bool>.broadcast().stream,
             ctr: _homeController,
             callback: showUserBottonSheet,
           ),
@@ -65,6 +74,7 @@ class _HomePageState extends State<HomePage>
                 dividerColor: Colors.transparent,
                 enableFeedback: true,
                 splashBorderRadius: BorderRadius.circular(10),
+                tabAlignment: TabAlignment.center,
                 onTap: (value) {
                   feedBack();
                   if (_homeController.initialIndex == value) {
@@ -118,7 +128,7 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
             duration: const Duration(milliseconds: 500),
             height: snapshot.data
                 ? MediaQuery.of(context).padding.top + 52
-                : MediaQuery.of(context).padding.top,
+                : MediaQuery.of(context).padding.top - 10,
             child: Container(
               padding: EdgeInsets.only(
                 left: 20,
@@ -129,7 +139,13 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
               child: Row(
                 children: [
                   const Expanded(child: SearchPage()),
-                  const SizedBox(width: 10),
+                  if (ctr!.userLogin.value) ...[
+                    const SizedBox(width: 6),
+                    IconButton(
+                        onPressed: () => Get.toNamed('/whisper'),
+                        icon: const Icon(Icons.notifications_none))
+                  ],
+                  const SizedBox(width: 6),
                   Obx(
                     () => ctr!.userLogin.value
                         ? Stack(

lib/pages/hot/view.dart

@@ -9,6 +9,7 @@ import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/skeleton/video_card_h.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/video_card_h.dart';
+import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/hot/controller.dart';
 import 'package:pilipala/pages/main/index.dart';
 
@@ -35,6 +36,8 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
     scrollController = _hotController.scrollController;
     StreamController<bool> mainStream =
         Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
     scrollController.addListener(
       () {
         if (scrollController.position.pixels >=
@@ -49,8 +52,10 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
             scrollController.position.userScrollDirection;
         if (direction == ScrollDirection.forward) {
           mainStream.add(true);
+          searchBarStream.add(true);
         } else if (direction == ScrollDirection.reverse) {
           mainStream.add(false);
+          searchBarStream.add(false);
         }
       },
     );

lib/pages/html/view.dart

@@ -9,7 +9,6 @@ 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';

lib/pages/later/view.dart

@@ -32,7 +32,7 @@ class _LaterPageState extends State<LaterPage> {
         title: Obx(
           () => _laterController.laterList.isNotEmpty
               ? Text(
-                  '稍后再看 (${_laterController.laterList.length}/100)',
+                  '稍后再看 (${_laterController.laterList.length})',
                   style: Theme.of(context).textTheme.titleMedium,
                 )
               : Text(

lib/pages/live/view.dart

@@ -9,6 +9,7 @@ import 'package:pilipala/common/skeleton/video_card_v.dart';
 import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
+import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/rcmd/index.dart';
 
@@ -38,6 +39,8 @@ class _LivePageState extends State<LivePage>
     scrollController = _liveController.scrollController;
     StreamController<bool> mainStream =
         Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
     scrollController.addListener(
       () {
         if (scrollController.position.pixels >=
@@ -52,8 +55,10 @@ class _LivePageState extends State<LivePage>
             scrollController.position.userScrollDirection;
         if (direction == ScrollDirection.forward) {
           mainStream.add(true);
+          searchBarStream.add(true);
         } else if (direction == ScrollDirection.reverse) {
           mainStream.add(false);
+          searchBarStream.add(false);
         }
       },
     );
@@ -67,6 +72,7 @@ class _LivePageState extends State<LivePage>
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return Container(
       clipBehavior: Clip.hardEdge,
       margin: const EdgeInsets.only(

lib/pages/liveRoom/view.dart

@@ -52,7 +52,6 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
 
   @override
   Widget build(BuildContext context) {
-    final videoHeight = MediaQuery.of(context).size.width * 9 / 16;
     Widget childWhenDisabled = Scaffold(
       primary: true,
       appBar: AppBar(

lib/pages/liveRoom/widgets/bottom_control.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/pages/liveRoom/index.dart';
@@ -43,10 +42,6 @@ class _BottomControlState extends State<BottomControl> {
 
   @override
   Widget build(BuildContext context) {
-    const textStyle = TextStyle(
-      color: Colors.white,
-      fontSize: 12,
-    );
     return AppBar(
       backgroundColor: Colors.transparent,
       foregroundColor: Colors.white,

lib/pages/main/controller.dart

@@ -55,6 +55,7 @@ class MainController extends GetxController {
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
   DateTime? _lastPressedAt;
+  late bool hideTabBar;
 
   @override
   void onInit() {
@@ -62,6 +63,7 @@ class MainController extends GetxController {
     if (setting.get(SettingBoxKey.autoUpdate, defaultValue: false)) {
       Utils.checkUpdata();
     }
+    hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
   }
 
   Future<bool> onBackPressed(BuildContext context) {

lib/pages/main/view.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
@@ -113,8 +115,8 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
         MediaQuery.of(context).size.width * 9 / 16;
     localCache.put('sheetHeight', sheetHeight);
     localCache.put('statusBarHeight', statusBarHeight);
-    return WillPopScope(
+    return PopScope(
-      onWillPop: () => _mainController.onBackPressed(context),
+      onPopInvoked: (bool status) => _mainController.onBackPressed(context),
       child: Scaffold(
         extendBody: true,
         body: FadeTransition(
@@ -142,7 +144,9 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
           ),
         ),
         bottomNavigationBar: StreamBuilder(
-          stream: _mainController.bottomBarStream.stream,
+          stream: _mainController.hideTabBar
+              ? _mainController.bottomBarStream.stream
+              : StreamController<bool>.broadcast().stream,
           initialData: true,
           builder: (context, AsyncSnapshot snapshot) {
             return AnimatedSlide(

lib/pages/media/controller.dart

@@ -36,6 +36,7 @@ class MediaController extends GetxController {
   ];
   var userInfo;
   int? mid;
+  final ScrollController scrollController = ScrollController();
 
   @override
   void onInit() {

lib/pages/media/view.dart

@@ -1,7 +1,11 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/pages/main/index.dart';
 import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
@@ -25,12 +29,32 @@ class _MediaPageState extends State<MediaPage>
     super.initState();
     mediaController = Get.put(MediaController());
     _futureBuilderFuture = mediaController.queryFavFolder();
+    ScrollController scrollController = mediaController.scrollController;
+    StreamController<bool> mainStream =
+        Get.find<MainController>().bottomBarStream;
 
     mediaController.userLogin.listen((status) {
       setState(() {
         _futureBuilderFuture = mediaController.queryFavFolder();
       });
     });
+    scrollController.addListener(
+      () {
+        final ScrollDirection direction =
+            scrollController.position.userScrollDirection;
+        if (direction == ScrollDirection.forward) {
+          mainStream.add(true);
+        } else if (direction == ScrollDirection.reverse) {
+          mainStream.add(false);
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    mediaController.scrollController.removeListener(() {});
+    super.dispose();
   }
 
   @override
@@ -40,6 +64,7 @@ class _MediaPageState extends State<MediaPage>
     return Scaffold(
       appBar: AppBar(toolbarHeight: 30),
       body: SingleChildScrollView(
+        controller: mediaController.scrollController,
         child: Column(
           children: [
             ListTile(

lib/pages/member/archive/index.dart

@@ -1,4 +0,0 @@
-library archive_panel;
-
-export './controller.dart';
-export 'index.dart';

lib/pages/member/archive/view.dart

@@ -1,240 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:loading_more_list/loading_more_list.dart';
-import 'package:pilipala/common/widgets/video_card_h.dart';
-import 'package:pilipala/models/member/archive.dart';
-import 'package:pilipala/pages/member/archive/index.dart';
-import 'package:pilipala/utils/utils.dart';
-import 'package:pull_to_refresh_notification/pull_to_refresh_notification.dart';
-
-class ArchivePanel extends StatefulWidget {
-  final int? mid;
-  const ArchivePanel({super.key, this.mid});
-
-  @override
-  State<ArchivePanel> createState() => _ArchivePanelState();
-}
-
-class _ArchivePanelState extends State<ArchivePanel>
-    with AutomaticKeepAliveClientMixin {
-  DateTime lastRefreshTime = DateTime.now();
-  late final LoadMoreListSource source;
-  late final ArchiveController _archiveController;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    super.initState();
-    print('🐶🐶： ${widget.mid}');
-    _archiveController = Get.put(ArchiveController(widget.mid),
-        tag: Utils.makeHeroTag(widget.mid));
-    source = LoadMoreListSource(_archiveController);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return PullToRefreshNotification(
-      onRefresh: () async {
-        await Future.delayed(const Duration(seconds: 1));
-        return true;
-      },
-      maxDragOffset: 50,
-      child: GlowNotificationWidget(
-        Column(
-          children: <Widget>[
-            // 下拉刷新指示器
-            // PullToRefreshContainer(
-            //   (PullToRefreshScrollNotificationInfo? info) {
-            //     return PullToRefreshHeader(info, lastRefreshTime);
-            //   },
-            // ),
-            Padding(
-              padding:
-                  const EdgeInsets.only(left: 14, top: 8, bottom: 8, right: 8),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  const Text('排序方式'),
-                  SizedBox(
-                    height: 35,
-                    width: 85,
-                    child: TextButton(
-                      style: ButtonStyle(
-                        padding: MaterialStateProperty.all(EdgeInsets.zero),
-                      ),
-                      onPressed: () {
-                        // _archiveController.order = 'click';
-                        // _archiveController.pn = 1;
-                        _archiveController.toggleSort();
-                        source.refresh(true);
-                        // LoadMoreListSource().loadData();
-                      },
-                      child: Obx(
-                        () => AnimatedSwitcher(
-                          duration: const Duration(milliseconds: 400),
-                          transitionBuilder:
-                              (Widget child, Animation<double> animation) {
-                            return ScaleTransition(
-                                scale: animation, child: child);
-                          },
-                          child: Text(
-                            _archiveController.currentOrder['label']!,
-                            key: ValueKey<String>(
-                                _archiveController.currentOrder['label']!),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            Expanded(
-              child: LoadingMoreList<VListItemModel>(
-                ListConfig<VListItemModel>(
-                  sourceList: source,
-                  itemBuilder:
-                      (BuildContext c, VListItemModel item, int index) {
-                    if (index == 0) {
-                      return Column(
-                        children: [
-                          const SizedBox(height: 6),
-                          VideoCardH(videoItem: item)
-                        ],
-                      );
-                    } else {
-                      return VideoCardH(videoItem: item);
-                    }
-                  },
-                  indicatorBuilder: _buildIndicator,
-                ),
-              ),
-            )
-          ],
-        ),
-        showGlowLeading: false,
-      ),
-    );
-  }
-
-  Widget _buildIndicator(BuildContext context, IndicatorStatus status) {
-    TextStyle style =
-        TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline);
-    Widget? widget;
-    switch (status) {
-      case IndicatorStatus.none:
-        widget = Container(height: 0.0);
-        break;
-      case IndicatorStatus.loadingMoreBusying:
-        widget = Text('加载中...', style: style);
-        widget = _setbackground(false, widget, height: 60.0);
-        break;
-      case IndicatorStatus.fullScreenBusying:
-        widget = Text('加载中...', style: style);
-        widget = _setbackground(true, widget);
-        break;
-      case IndicatorStatus.error:
-
-        /// TODO 异常逻辑
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(false, widget);
-
-        widget = GestureDetector(
-          onTap: () {},
-          child: widget,
-        );
-
-        break;
-      case IndicatorStatus.fullScreenError:
-
-        /// TODO 异常逻辑
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(true, widget);
-        widget = GestureDetector(
-          onTap: () {},
-          child: widget,
-        );
-        break;
-      case IndicatorStatus.noMoreLoad:
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(false, widget, height: 60.0);
-        break;
-      case IndicatorStatus.empty:
-        widget = Text('用户没有投稿', style: style);
-        widget = _setbackground(true, widget);
-        break;
-    }
-    return widget;
-  }
-
-  Widget _setbackground(bool full, Widget widget, {double height = 100}) {
-    widget = Padding(
-      padding: height == double.infinity
-          ? EdgeInsets.zero
-          : EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      child: Container(
-        width: double.infinity,
-        height: height,
-        color: Theme.of(context).colorScheme.background,
-        alignment: Alignment.center,
-        child: widget,
-      ),
-    );
-    return widget;
-  }
-
-  Widget getIndicator(BuildContext context) {
-    final TargetPlatform platform = Theme.of(context).platform;
-    return platform == TargetPlatform.iOS
-        ? const CupertinoActivityIndicator(
-            animating: true,
-            radius: 16.0,
-          )
-        : CircularProgressIndicator(
-            strokeWidth: 2.0,
-            valueColor:
-                AlwaysStoppedAnimation<Color>(Theme.of(context).primaryColor),
-          );
-  }
-}
-
-class LoadMoreListSource extends LoadingMoreBase<VListItemModel> {
-  late ArchiveController ctr;
-  LoadMoreListSource(this.ctr);
-  bool forceRefresh = false;
-
-  @override
-  Future<bool> loadData([bool isloadMoreAction = false]) async {
-    bool isSuccess = false;
-    var res = await ctr.getMemberArchive();
-    if (res['status']) {
-      if (ctr.pn == 2) {
-        clear();
-      }
-      addAll(res['data'].list.vlist);
-    }
-    if (length < res['data'].page['count']) {
-      isSuccess = true;
-    } else {
-      isSuccess = false;
-    }
-    return isSuccess;
-  }
-
-  @override
-  Future<bool> refresh([bool clearBeforeRequest = false]) async {
-    // _hasMore = true;
-    // pageindex = 1;
-    // //force to refresh list when you don't want clear list before request
-    // //for the case, if your list already has 20 items.
-    forceRefresh = !clearBeforeRequest;
-    var result = await super.refresh(clearBeforeRequest);
-
-    forceRefresh = false;
-    return result;
-  }
-}

lib/pages/member/controller.dart

@@ -6,6 +6,7 @@ import 'package:pilipala/http/member.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/member/archive.dart';
+import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';
@@ -13,16 +14,17 @@ import 'package:share_plus/share_plus.dart';
 class MemberController extends GetxController {
   late int mid;
   Rx<MemberInfoModel> memberInfo = MemberInfoModel().obs;
-  Map? userStat;
+  late Map userStat;
   RxString face = ''.obs;
   String? heroTag;
   Box userInfoCache = GStrorage.userInfo;
   late int ownerMid;
   // 投稿列表
   RxList<VListItemModel>? archiveList = [VListItemModel()].obs;
-  var userInfo;
+  dynamic userInfo;
   RxInt attribute = (-1).obs;
   RxString attributeText = '关注'.obs;
+  RxList<MemberCoinsDataModel> recentCoinsList = <MemberCoinsDataModel>[].obs;
 
   @override
   void onInit() {
@@ -38,6 +40,7 @@ class MemberController extends GetxController {
   // 获取用户信息
   Future<Map<String, dynamic>> getInfo() async {
     await getMemberStat();
+    await getMemberView();
     var res = await MemberHttp.memberInfo(mid: mid);
     if (res['status']) {
       memberInfo.value = res['data'];
@@ -55,13 +58,14 @@ class MemberController extends GetxController {
     return res;
   }
 
-  // Future getMemberCardInfo() async {
+  // 获取用户播放数 获赞数
-  //   var res = await MemberHttp.memberCardInfo(mid: mid);
+  Future<Map<String, dynamic>> getMemberView() async {
-  //   if (res['status']) {
+    var res = await MemberHttp.memberView(mid: mid);
-  //     print(userStat);
+    if (res['status']) {
-  //   }
+      userStat.addAll(res['data']);
-  //   return res;
+    }
-  // }
+    return res;
+  }
 
   // 关注/取关up
   Future actionRelationMod() async {
@@ -112,16 +116,28 @@ class MemberController extends GetxController {
   Future relationSearch() async {
     if (userInfo == null) return;
     if (mid == ownerMid) return;
-    var res = await UserHttp.relationSearch(mid);
+    var res = await UserHttp.hasFollow(mid);
     if (res['status']) {
-      attribute.value = res['data']['relation']['attribute'];
+      attribute.value = res['data']['attribute'];
-      attributeText.value = attribute.value == 0
+      switch (attribute.value) {
-          ? '关注'
+        case 1:
-          : attribute.value == 2
+          attributeText.value = '悄悄关注';
-              ? '已关注'
+          break;
-              : attribute.value == 6
+        case 2:
-                  ? '已互粉'
+          attributeText.value = '已关注';
-                  : '已拉黑';
+          break;
+        case 6:
+          attributeText.value = '已互关';
+          break;
+        case 128:
+          attributeText.value = '已拉黑';
+          break;
+        default:
+          attributeText.value = '关注';
+      }
+      if (res['data']['special'] == 1) {
+        attributeText.value += 'SP';
+      }
     }
   }
 
@@ -173,4 +189,35 @@ class MemberController extends GetxController {
   void shareUser() {
     Share.share('${memberInfo.value.name} - https://space.bilibili.com/$mid');
   }
+
+  // 请求专栏
+  Future getMemberSeasons() async {
+    if (userInfo == null) return;
+    var res = await MemberHttp.getMemberSeasons(mid, 1, 10);
+    if (!res['status']) {
+      SmartDialog.showToast("用户专栏请求异常：${res['msg']}");
+    }
+    return res;
+  }
+
+  // 请求投币视频
+  Future getRecentCoinVideo() async {
+    if (userInfo == null) return;
+    var res = await MemberHttp.getRecentCoinVideo(mid: mid);
+    recentCoinsList.value = res['data'];
+    return res;
+  }
+
+  // 跳转查看动态
+  void pushDynamicsPage() => Get.toNamed('/memberDynamics?mid=$mid');
+
+  // 跳转查看投稿
+  void pushArchivesPage() => Get.toNamed('/memberArchive?mid=$mid');
+
+  // 跳转查看专栏
+  void pushSeasonsPage() {}
+  // 跳转查看最近投币
+  void pushRecentCoinsPage() async {
+    if (recentCoinsList.isNotEmpty) {}
+  }
 }

lib/pages/member/dynamic/controller.dart

@@ -1,31 +0,0 @@
-import 'package:get/get.dart';
-import 'package:pilipala/http/member.dart';
-
-class MemberDynamicPanelController extends GetxController {
-  MemberDynamicPanelController(this.mid);
-  int? mid;
-  String offset = '';
-  int count = 0;
-  bool hasMore = true;
-
-  @override
-  void onInit() {
-    super.onInit();
-    mid ??= int.parse(Get.parameters['mid']!);
-  }
-
-  Future getMemberDynamic() async {
-    if (!hasMore) {
-      return {'status': false};
-    }
-    var res = await MemberHttp.memberDynamic(
-      offset: offset,
-      mid: mid,
-    );
-    if (res['status']) {
-      offset = res['data'].offset;
-      hasMore = res['data'].hasMore;
-    }
-    return res;
-  }
-}

lib/pages/member/dynamic/view.dart

@@ -1,152 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:loading_more_list/loading_more_list.dart';
-import 'package:pilipala/models/dynamics/result.dart';
-import 'package:pilipala/pages/dynamics/widgets/dynamic_panel.dart';
-import 'package:pilipala/utils/utils.dart';
-
-import 'controller.dart';
-
-class MemberDynamicPanel extends StatefulWidget {
-  final int? mid;
-  const MemberDynamicPanel({super.key, this.mid});
-
-  @override
-  State<MemberDynamicPanel> createState() => _MemberDynamicPanelState();
-}
-
-class _MemberDynamicPanelState extends State<MemberDynamicPanel>
-    with AutomaticKeepAliveClientMixin {
-  DateTime lastRefreshTime = DateTime.now();
-  late final LoadMoreListSource source;
-  late final MemberDynamicPanelController _dynamicController;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    super.initState();
-    _dynamicController = Get.put(MemberDynamicPanelController(widget.mid),
-        tag: Utils.makeHeroTag(widget.mid));
-    source = LoadMoreListSource(_dynamicController);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return LoadingMoreList<DynamicItemModel>(
-      ListConfig<DynamicItemModel>(
-        sourceList: source,
-        itemBuilder: (BuildContext c, DynamicItemModel item, int index) {
-          return DynamicPanel(item: item);
-        },
-        indicatorBuilder: _buildIndicator,
-      ),
-    );
-  }
-
-  Widget _buildIndicator(BuildContext context, IndicatorStatus status) {
-    TextStyle style =
-        TextStyle(fontSize: 13, color: Theme.of(context).colorScheme.outline);
-    Widget? widget;
-    switch (status) {
-      case IndicatorStatus.none:
-        widget = Container(height: 0.0);
-        break;
-      case IndicatorStatus.loadingMoreBusying:
-        widget = Text('加载中...', style: style);
-        widget = _setbackground(false, widget, height: 60.0);
-        break;
-      case IndicatorStatus.fullScreenBusying:
-        widget = Text('加载中...', style: style);
-        widget = _setbackground(true, widget);
-        break;
-      case IndicatorStatus.error:
-
-        /// TODO 异常逻辑
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(false, widget);
-
-        widget = GestureDetector(
-          onTap: () {},
-          child: widget,
-        );
-
-        break;
-      case IndicatorStatus.fullScreenError:
-
-        /// TODO 异常逻辑
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(true, widget);
-        widget = GestureDetector(
-          onTap: () {},
-          child: widget,
-        );
-        break;
-      case IndicatorStatus.noMoreLoad:
-        widget = Text('没有更多了', style: style);
-        widget = _setbackground(false, widget, height: 60.0);
-        break;
-      case IndicatorStatus.empty:
-        widget = Text('用户没有投稿', style: style);
-        widget = _setbackground(true, widget);
-        break;
-    }
-    return widget;
-  }
-
-  Widget _setbackground(bool full, Widget widget, {double height = 100}) {
-    widget = Padding(
-      padding: height == double.infinity
-          ? EdgeInsets.zero
-          : EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      child: Container(
-        width: double.infinity,
-        height: height,
-        color: Theme.of(context).colorScheme.background,
-        alignment: Alignment.center,
-        child: widget,
-      ),
-    );
-    return widget;
-  }
-
-  Widget getIndicator(BuildContext context) {
-    final TargetPlatform platform = Theme.of(context).platform;
-    return platform == TargetPlatform.iOS
-        ? const CupertinoActivityIndicator(
-            animating: true,
-            radius: 16.0,
-          )
-        : CircularProgressIndicator(
-            strokeWidth: 2.0,
-            valueColor:
-                AlwaysStoppedAnimation<Color>(Theme.of(context).primaryColor),
-          );
-  }
-}
-
-class LoadMoreListSource extends LoadingMoreBase<DynamicItemModel> {
-  late MemberDynamicPanelController ctr;
-  LoadMoreListSource(this.ctr);
-
-  @override
-  Future<bool> loadData([bool isloadMoreAction = false]) async {
-    bool isSuccess = false;
-    var res = await ctr.getMemberDynamic();
-    if (res['status']) {
-      addAll(res['data'].items);
-    }
-    try {
-      if (res['data'].hasMore) {
-        isSuccess = true;
-      } else {
-        isSuccess = false;
-      }
-    } catch (_) {}
-
-    return isSuccess;
-  }
-}

lib/pages/member/view.dart

@@ -1,16 +1,16 @@
 import 'dart:async';
 
-import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/pages/member/archive/view.dart';
-import 'package:pilipala/pages/member/dynamic/index.dart';
 import 'package:pilipala/pages/member/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
+import 'widgets/conis.dart';
 import 'widgets/profile.dart';
+import 'widgets/seasons.dart';
 
 class MemberPage extends StatefulWidget {
   const MemberPage({super.key});
@@ -23,9 +23,10 @@ class _MemberPageState extends State<MemberPage>
     with SingleTickerProviderStateMixin {
   late String heroTag;
   late MemberController _memberController;
-  Future? _futureBuilderFuture;
+  late Future _futureBuilderFuture;
+  late Future _memberSeasonsFuture;
+  late Future _memberCoinsFuture;
   final ScrollController _extendNestCtr = ScrollController();
-  late TabController _tabController;
   final StreamController<bool> appbarStream = StreamController<bool>();
   late int mid;
 
@@ -35,12 +36,13 @@ class _MemberPageState extends State<MemberPage>
     mid = int.parse(Get.parameters['mid']!);
     heroTag = Get.arguments['heroTag'] ?? Utils.makeHeroTag(mid);
     _memberController = Get.put(MemberController(), tag: heroTag);
-    _tabController = TabController(length: 3, vsync: this, initialIndex: 2);
     _futureBuilderFuture = _memberController.getInfo();
+    _memberSeasonsFuture = _memberController.getMemberSeasons();
+    _memberCoinsFuture = _memberController.getRecentCoinVideo();
     _extendNestCtr.addListener(
       () {
         double offset = _extendNestCtr.position.pixels;
-        if (offset > 230) {
+        if (offset > 100) {
           appbarStream.add(true);
         } else {
           appbarStream.add(false);
@@ -59,183 +61,222 @@ class _MemberPageState extends State<MemberPage>
   Widget build(BuildContext context) {
     return Scaffold(
       primary: true,
-      body: ExtendedNestedScrollView(
+      body: Column(
-        controller: _extendNestCtr,
+        children: [
-        headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
+          AppBar(
-          return <Widget>[
+            title: StreamBuilder(
-            SliverAppBar(
+              stream: appbarStream.stream,
-              pinned: false,
+              initialData: false,
-              primary: true,
+              builder: (context, AsyncSnapshot snapshot) {
-              elevation: 0,
+                return AnimatedOpacity(
-              scrolledUnderElevation: 1,
+                  opacity: snapshot.data ? 1 : 0,
-              forceElevated: innerBoxIsScrolled,
+                  curve: Curves.easeOut,
-              expandedHeight: 290,
+                  duration: const Duration(milliseconds: 500),
-              titleSpacing: 0,
+                  child: Row(
-              title: StreamBuilder(
+                    children: [
-                stream: appbarStream.stream,
+                      Row(
-                initialData: false,
+                        children: [
-                builder: (context, AsyncSnapshot snapshot) {
+                          Obx(
-                  return AnimatedOpacity(
+                            () => NetworkImgLayer(
-                    opacity: snapshot.data ? 1 : 0,
+                              width: 35,
-                    curve: Curves.easeOut,
+                              height: 35,
-                    duration: const Duration(milliseconds: 500),
+                              type: 'avatar',
-                    child: Row(
+                              src: _memberController.face.value,
-                      children: [
-                        Row(
-                          children: [
-                            Obx(
-                              () => NetworkImgLayer(
-                                width: 35,
-                                height: 35,
-                                type: 'avatar',
-                                src: _memberController.face.value,
-                              ),
                             ),
-                            const SizedBox(width: 10),
+                          ),
-                            Obx(
+                          const SizedBox(width: 10),
-                              () => Text(
+                          Obx(
-                                _memberController.memberInfo.value.name ?? '',
+                            () => Text(
-                                style: TextStyle(
+                              _memberController.memberInfo.value.name ?? '',
-                                    color: Theme.of(context)
+                              style: TextStyle(
-                                        .colorScheme
+                                  color: Theme.of(context)
-                                        .onBackground,
+                                      .colorScheme
-                                    fontSize: 14),
+                                      .onBackground,
-                              ),
+                                  fontSize: 14),
                             ),
-                          ],
+                          ),
-                        )
+                        ],
-                      ],
-                    ),
-                  );
-                },
-              ),
-              actions: [
-                IconButton(
-                  onPressed: () => Get.toNamed(
-                      '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
-                  icon: const Icon(Icons.search_outlined),
-                ),
-                PopupMenuButton(
-                  icon: const Icon(Icons.more_vert),
-                  itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-                    if (_memberController.ownerMid !=
-                        _memberController.mid) ...[
-                      PopupMenuItem(
-                        onTap: () => _memberController.blockUser(),
-                        child: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            const Icon(Icons.block, size: 19),
-                            const SizedBox(width: 10),
-                            Text(_memberController.attribute.value != 128
-                                ? '加入黑名单'
-                                : '移除黑名单'),
-                          ],
-                        ),
                       )
                     ],
+                  ),
+                );
+              },
+            ),
+            actions: [
+              IconButton(
+                onPressed: () => Get.toNamed(
+                    '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
+                icon: const Icon(Icons.search_outlined),
+              ),
+              PopupMenuButton(
+                icon: const Icon(Icons.more_vert),
+                itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                  if (_memberController.ownerMid != _memberController.mid) ...[
                     PopupMenuItem(
-                      onTap: () => _memberController.shareUser(),
+                      onTap: () => _memberController.blockUser(),
                       child: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          const Icon(Icons.share_outlined, size: 19),
+                          const Icon(Icons.block, size: 19),
                           const SizedBox(width: 10),
-                          Text(_memberController.ownerMid !=
+                          Text(_memberController.attribute.value != 128
-                                  _memberController.mid
+                              ? '加入黑名单'
-                              ? '分享UP主'
+                              : '移除黑名单'),
-                              : '分享我的主页'),
                         ],
                       ),
-                    ),
+                    )
                   ],
+                  PopupMenuItem(
+                    onTap: () => _memberController.shareUser(),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const Icon(Icons.share_outlined, size: 19),
+                        const SizedBox(width: 10),
+                        Text(_memberController.ownerMid != _memberController.mid
+                            ? '分享UP主'
+                            : '分享我的主页'),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(width: 4),
+            ],
+          ),
+          Expanded(
+            child: SingleChildScrollView(
+              controller: _extendNestCtr,
+              child: Padding(
+                padding: EdgeInsets.only(
+                  bottom: MediaQuery.of(context).padding.bottom + 20,
                 ),
-                const SizedBox(width: 4),
+                child: Column(
-              ],
-              flexibleSpace: FlexibleSpaceBar(
-                background: Stack(
                   children: [
+                    profileWidget(),
+
+                    /// 动态链接
+                    ListTile(
+                      onTap: _memberController.pushDynamicsPage,
+                      title: const Text('Ta的动态'),
+                      trailing:
+                          const Icon(Icons.arrow_forward_outlined, size: 19),
+                    ),
+
+                    /// 视频
+                    ListTile(
+                      onTap: _memberController.pushArchivesPage,
+                      title: const Text('Ta的投稿'),
+                      trailing:
+                          const Icon(Icons.arrow_forward_outlined, size: 19),
+                    ),
+
+                    /// 专栏
+                    ListTile(
+                      onTap: () {},
+                      title: const Text('Ta的专栏'),
+                    ),
+                    MediaQuery.removePadding(
+                      removeTop: true,
+                      removeBottom: true,
+                      context: context,
+                      child: Padding(
+                        padding: const EdgeInsets.only(
+                          left: StyleString.safeSpace,
+                          right: StyleString.safeSpace,
+                        ),
+                        child: FutureBuilder(
+                          future: _memberSeasonsFuture,
+                          builder: (context, snapshot) {
+                            if (snapshot.connectionState ==
+                                ConnectionState.done) {
+                              if (snapshot.data == null) {
+                                return const SizedBox();
+                              }
+                              if (snapshot.data['status']) {
+                                Map data = snapshot.data as Map;
+                                if (data['data'].seasonsList.isEmpty) {
+                                  return commenWidget('用户没有设置专栏');
+                                } else {
+                                  return MemberSeasonsPanel(data: data['data']);
+                                }
+                              } else {
+                                // 请求错误
+                                return const SizedBox();
+                              }
+                            } else {
+                              return const SizedBox();
+                            }
+                          },
+                        ),
+                      ),
+                    ),
+
+                    /// 收藏
+
+                    /// 追番
+                    /// 最近投币
                     Obx(
-                      () => _memberController.face.value != ''
+                      () => _memberController.recentCoinsList.isNotEmpty
-                          ? Positioned.fill(
+                          ? ListTile(
-                              bottom: 10,
+                              onTap: () {},
-                              child: Container(
+                              title: const Text('最近投币的视频'),
-                                decoration: BoxDecoration(
+                              // trailing: const Icon(Icons.arrow_forward_outlined,
-                                  image: DecorationImage(
+                              //     size: 19),
-                                    fit: BoxFit.fitWidth,
-                                    image: NetworkImage(
-                                        _memberController.face.value),
-                                    alignment: Alignment.topCenter,
-                                    isAntiAlias: true,
-                                  ),
-                                ),
-                                foregroundDecoration: BoxDecoration(
-                                  gradient: LinearGradient(
-                                    colors: [
-                                      Theme.of(context)
-                                          .colorScheme
-                                          .background
-                                          .withOpacity(0.44),
-                                      Theme.of(context).colorScheme.background,
-                                    ],
-                                    begin: Alignment.topCenter,
-                                    end: Alignment.bottomCenter,
-                                    stops: const [0.0, 0.46],
-                                  ),
-                                ),
-                              ),
                             )
                           : const SizedBox(),
                     ),
-                    Positioned(
+                    MediaQuery.removePadding(
-                      left: 0,
+                      removeTop: true,
-                      right: 0,
+                      removeBottom: true,
-                      bottom: 0,
+                      context: context,
-                      height: 20,
+                      child: Padding(
-                      child: Container(
+                        padding: const EdgeInsets.only(
-                        color: Theme.of(context).colorScheme.background,
+                          left: StyleString.safeSpace,
+                          right: StyleString.safeSpace,
+                        ),
+                        child: FutureBuilder(
+                          future: _memberCoinsFuture,
+                          builder: (context, snapshot) {
+                            if (snapshot.connectionState ==
+                                ConnectionState.done) {
+                              if (snapshot.data == null) {
+                                return const SizedBox();
+                              }
+                              if (snapshot.data['status']) {
+                                Map data = snapshot.data as Map;
+                                return MemberCoinsPanel(data: data['data']);
+                              } else {
+                                // 请求错误
+                                return const SizedBox();
+                              }
+                            } else {
+                              return const SizedBox();
+                            }
+                          },
+                        ),
                       ),
                     ),
-                    profileWidget(),
+                    // 最近点赞
+                    // ListTile(
+                    //   onTap: () {},
+                    //   title: const Text('最近点赞的视频'),
+                    //   trailing:
+                    //       const Icon(Icons.arrow_forward_outlined, size: 19),
+                    // ),
                   ],
                 ),
               ),
             ),
-          ];
+          ),
-        },
+        ],
-        pinnedHeaderSliverHeightBuilder: () {
-          return MediaQuery.of(context).padding.top + kToolbarHeight;
-        },
-        onlyOneScrollInBody: true,
-        body: Column(
-          children: [
-            SizedBox(
-              width: double.infinity,
-              height: 50,
-              child: TabBar(controller: _tabController, tabs: const [
-                Tab(text: '主页'),
-                Tab(text: '动态'),
-                Tab(text: '投稿'),
-              ]),
-            ),
-            Expanded(
-                child: TabBarView(
-              controller: _tabController,
-              children: [
-                const Text('主页'),
-                MemberDynamicPanel(mid: mid),
-                ArchivePanel(mid: mid),
-              ],
-            ))
-          ],
-        ),
       ),
     );
   }
 
   Widget profileWidget() {
     return Padding(
-      padding: const EdgeInsets.only(left: 18, right: 18),
+      padding: const EdgeInsets.only(left: 18, right: 18, bottom: 20),
       child: FutureBuilder(
         future: _futureBuilderFuture,
         builder: (context, snapshot) {
@@ -249,8 +290,8 @@ class _MemberPageState extends State<MemberPage>
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        profile(_memberController),
+                        ProfilePanel(ctr: _memberController),
-                        const SizedBox(height: 14),
+                        const SizedBox(height: 20),
                         Row(
                           children: [
                             Flexible(
@@ -260,7 +301,7 @@ class _MemberPageState extends State<MemberPage>
                               overflow: TextOverflow.ellipsis,
                               style: Theme.of(context)
                                   .textTheme
-                                  .bodyLarge!
+                                  .titleMedium!
                                   .copyWith(fontWeight: FontWeight.bold),
                             )),
                             const SizedBox(width: 2),
@@ -332,29 +373,11 @@ class _MemberPageState extends State<MemberPage>
                             softWrap: true,
                           ),
                         ],
-                        const SizedBox(height: 4),
+                        const SizedBox(height: 6),
                         if (_memberController.memberInfo.value.sign != '')
                           SelectableText(
                             _memberController.memberInfo.value.sign!,
-                            maxLines: _memberController
+                          ),
-                                        .memberInfo.value.official!['title'] !=
-                                    ''
-                                ? 1
-                                : 2,
-                            style: const TextStyle(
-                                overflow: TextOverflow.ellipsis),
-                            onTap: () {
-                              showDialog(
-                                context: context,
-                                builder: (context) {
-                                  return AlertDialog(
-                                    content: SelectableText(_memberController
-                                        .memberInfo.value.sign!),
-                                  );
-                                },
-                              );
-                            },
-                          )
                       ],
                     ),
                   ],
@@ -365,10 +388,28 @@ class _MemberPageState extends State<MemberPage>
             }
           } else {
             // 骨架屏
-            return profile(_memberController, loadingStatus: true);
+            return ProfilePanel(ctr: _memberController, loadingStatus: true);
           }
         },
       ),
     );
   }
+
+  Widget commenWidget(msg) {
+    return Padding(
+      padding: const EdgeInsets.only(
+        top: 20,
+        bottom: 30,
+      ),
+      child: Center(
+        child: Text(
+          msg,
+          style: Theme.of(context)
+              .textTheme
+              .labelMedium!
+              .copyWith(color: Theme.of(context).colorScheme.outline),
+        ),
+      ),
+    );
+  }
 }

lib/pages/member/widgets/conis.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/models/member/coin.dart';
+import 'package:pilipala/pages/member_coin/widgets/item.dart';
+
+class MemberCoinsPanel extends StatelessWidget {
+  final List<MemberCoinsDataModel>? data;
+  const MemberCoinsPanel({super.key, this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, boxConstraints) {
+        return GridView.builder(
+          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+            crossAxisCount: 2, // Use a fixed count for GridView
+            crossAxisSpacing: StyleString.safeSpace,
+            mainAxisSpacing: StyleString.safeSpace,
+            childAspectRatio: 0.94,
+          ),
+          physics: const NeverScrollableScrollPhysics(),
+          shrinkWrap: true,
+          itemCount: data!.length,
+          itemBuilder: (context, i) {
+            return MemberCoinsItem(coinItem: data![i]);
+          },
+        );
+      },
+    );
+  }
+}

lib/pages/member/widgets/profile.dart

@@ -6,125 +6,162 @@ import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/utils/utils.dart';
 
-Widget profile(ctr, {loadingStatus = false}) {
+class ProfilePanel extends StatelessWidget {
-  MemberInfoModel memberInfo = ctr.memberInfo.value;
+  final dynamic ctr;
-  return Builder(
+  final bool loadingStatus;
-    builder: ((context) {
+  const ProfilePanel({
-      return Padding(
+    super.key,
-        padding: EdgeInsets.only(top: 3 * MediaQuery.of(context).padding.top),
+    required this.ctr,
-        child: Row(
+    this.loadingStatus = false,
-          children: [
+  });
-            Hero(
+
-              tag: ctr.heroTag!,
+  @override
-              child: Stack(
+  Widget build(BuildContext context) {
-                children: [
+    MemberInfoModel memberInfo = ctr.memberInfo.value;
-                  NetworkImgLayer(
+    return Builder(
-                    width: 90,
+      builder: ((context) {
-                    height: 90,
+        return Padding(
-                    type: 'avatar',
+          padding:
-                    src: !loadingStatus ? memberInfo.face : ctr.face.value,
+              EdgeInsets.only(top: MediaQuery.of(context).padding.top - 20),
-                  ),
+          child: Row(
-                  if (!loadingStatus &&
+            children: [
-                      memberInfo.liveRoom != null &&
+              Hero(
-                      memberInfo.liveRoom!.liveStatus == 1)
+                tag: ctr.heroTag!,
-                    Positioned(
+                child: Stack(
-                      bottom: 0,
+                  children: [
-                      left: 14,
+                    NetworkImgLayer(
-                      child: GestureDetector(
+                      width: 90,
-                        onTap: () {
+                      height: 90,
-                          LiveItemModel liveItem = LiveItemModel.fromJson({
+                      type: 'avatar',
-                            'title': memberInfo.liveRoom!.title,
+                      src: !loadingStatus ? memberInfo.face : ctr.face.value,
-                            'uname': memberInfo.name,
+                    ),
-                            'face': memberInfo.face,
+                    if (!loadingStatus &&
-                            'roomid': memberInfo.liveRoom!.roomId,
+                        memberInfo.liveRoom != null &&
-                            'watched_show': memberInfo.liveRoom!.watchedShow,
+                        memberInfo.liveRoom!.liveStatus == 1)
-                          });
+                      Positioned(
-                          Get.toNamed(
+                        bottom: 0,
-                            '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                        left: 14,
-                            arguments: {'liveItem': liveItem},
+                        child: GestureDetector(
-                          );
-                        },
-                        child: Container(
-                          padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                          decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.primary,
-                            borderRadius:
-                                const BorderRadius.all(Radius.circular(10)),
-                          ),
-                          child: Row(children: [
-                            Image.asset(
-                              'assets/images/live.gif',
-                              height: 10,
-                            ),
-                            Text(
-                              ' 直播中',
-                              style: TextStyle(
-                                  color: Colors.white,
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .labelSmall!
-                                      .fontSize),
-                            )
-                          ]),
-                        ),
-                      ),
-                    )
-                ],
-              ),
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.only(left: 10, right: 10),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      children: [
-                        InkWell(
                           onTap: () {
+                            LiveItemModel liveItem = LiveItemModel.fromJson({
+                              'title': memberInfo.liveRoom!.title,
+                              'uname': memberInfo.name,
+                              'face': memberInfo.face,
+                              'roomid': memberInfo.liveRoom!.roomId,
+                              'watched_show': memberInfo.liveRoom!.watchedShow,
+                            });
                             Get.toNamed(
-                                '/follow?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                              '/liveRoom?roomid=${memberInfo.liveRoom!.roomId}',
+                              arguments: {'liveItem': liveItem},
+                            );
                           },
-                          child: Column(
+                          child: Container(
-                            children: [
+                            padding: const EdgeInsets.fromLTRB(6, 2, 6, 2),
-                              Text(
+                            decoration: BoxDecoration(
-                                !loadingStatus
+                              color: Theme.of(context).colorScheme.primary,
-                                    ? ctr.userStat!['following'].toString()
+                              borderRadius:
-                                    : '-',
+                                  const BorderRadius.all(Radius.circular(10)),
-                                style: const TextStyle(
+                            ),
-                                    fontWeight: FontWeight.bold),
+                            child: Row(children: [
+                              Image.asset(
+                                'assets/images/live.gif',
+                                height: 10,
                               ),
                               Text(
-                                '关注',
+                                ' 直播中',
                                 style: TextStyle(
+                                    color: Colors.white,
                                     fontSize: Theme.of(context)
                                         .textTheme
-                                        .labelMedium!
+                                        .labelSmall!
                                         .fontSize),
                               )
-                            ],
+                            ]),
                           ),
                         ),
-                        InkWell(
+                      )
-                          onTap: () {
+                  ],
-                            Get.toNamed(
+                ),
-                                '/fan?mid=${memberInfo.mid}&name=${memberInfo.name}');
+              ),
-                          },
+              const SizedBox(width: 12),
-                          child: Column(
+              Expanded(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Padding(
+                      padding:
+                          const EdgeInsets.only(top: 10, left: 10, right: 10),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.max,
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          InkWell(
+                            onTap: () {
+                              Get.toNamed(
+                                  '/follow?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                            },
+                            child: Column(
+                              children: [
+                                Text(
+                                  !loadingStatus
+                                      ? ctr.userStat!['following'].toString()
+                                      : '-',
+                                  style: const TextStyle(
+                                      fontWeight: FontWeight.bold),
+                                ),
+                                Text(
+                                  '关注',
+                                  style: TextStyle(
+                                      fontSize: Theme.of(context)
+                                          .textTheme
+                                          .labelMedium!
+                                          .fontSize),
+                                )
+                              ],
+                            ),
+                          ),
+                          InkWell(
+                            onTap: () {
+                              Get.toNamed(
+                                  '/fan?mid=${memberInfo.mid}&name=${memberInfo.name}');
+                            },
+                            child: Column(
+                              children: [
+                                Text(
+                                    !loadingStatus
+                                        ? ctr.userStat!['follower'] != null
+                                            ? Utils.numFormat(
+                                                ctr.userStat!['follower'],
+                                              )
+                                            : '-'
+                                        : '-',
+                                    style: const TextStyle(
+                                        fontWeight: FontWeight.bold)),
+                                Text(
+                                  '粉丝',
+                                  style: TextStyle(
+                                      fontSize: Theme.of(context)
+                                          .textTheme
+                                          .labelMedium!
+                                          .fontSize),
+                                )
+                              ],
+                            ),
+                          ),
+                          Column(
                             children: [
                               Text(
                                   !loadingStatus
-                                      ? Utils.numFormat(
+                                      ? ctr.userStat!['likes'] != null
-                                          ctr.userStat!['follower'],
+                                          ? Utils.numFormat(
-                                        )
+                                              ctr.userStat!['likes'],
+                                            )
+                                          : '-'
                                       : '-',
                                   style: const TextStyle(
                                       fontWeight: FontWeight.bold)),
                               Text(
-                                '粉丝',
+                                '获赞',
                                 style: TextStyle(
                                     fontSize: Theme.of(context)
                                         .textTheme
@@ -133,86 +170,89 @@ Widget profile(ctr, {loadingStatus = false}) {
                               )
                             ],
                           ),
-                        ),
+                        ],
-                        Column(
-                          children: [
-                            const Text('-',
-                                style: TextStyle(fontWeight: FontWeight.bold)),
-                            Text(
-                              '获赞',
-                              style: TextStyle(
-                                  fontSize: Theme.of(context)
-                                      .textTheme
-                                      .labelMedium!
-                                      .fontSize),
-                            )
-                          ],
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 10),
-                  if (ctr.ownerMid != ctr.mid) ...[
-                    Row(
-                      children: [
-                        Obx(
-                          () => Expanded(
-                            child: TextButton(
-                              onPressed: () => ctr.actionRelationMod(),
-                              style: TextButton.styleFrom(
-                                foregroundColor: ctr.attribute.value == -1
-                                    ? Colors.transparent
-                                    : ctr.attribute.value != 0
-                                        ? Theme.of(context).colorScheme.outline
-                                        : Theme.of(context)
-                                            .colorScheme
-                                            .onPrimary,
-                                backgroundColor: ctr.attribute.value != 0
-                                    ? Theme.of(context)
-                                        .colorScheme
-                                        .onInverseSurface
-                                    : Theme.of(context)
-                                        .colorScheme
-                                        .primary, // 设置按钮背景色
-                              ),
-                              child: Obx(() => Text(ctr.attributeText.value)),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 8),
-                        Expanded(
-                          child: TextButton(
-                            onPressed: () {},
-                            style: TextButton.styleFrom(
-                              backgroundColor: Theme.of(context)
-                                  .colorScheme
-                                  .onInverseSurface,
-                            ),
-                            child: const Text('发消息'),
-                          ),
-                        )
-                      ],
-                    )
-                  ] else ...[
-                    TextButton(
-                      onPressed: () {
-                        SmartDialog.showToast('功能开发中 💪');
-                      },
-                      style: TextButton.styleFrom(
-                        padding: const EdgeInsets.only(left: 80, right: 80),
-                        foregroundColor:
-                            Theme.of(context).colorScheme.onPrimary,
-                        backgroundColor: Theme.of(context).colorScheme.primary,
                       ),
-                      child: const Text('编辑资料'),
+                    ),
-                    )
+                    const SizedBox(height: 10),
-                  ]
+                    if (ctr.ownerMid != ctr.mid && ctr.ownerMid != -1) ...[
-                ],
+                      Row(
+                        children: [
+                          Obx(
+                            () => Expanded(
+                              child: TextButton(
+                                onPressed: () => ctr.actionRelationMod(),
+                                style: TextButton.styleFrom(
+                                  foregroundColor: ctr.attribute.value == -1
+                                      ? Colors.transparent
+                                      : ctr.attribute.value != 0
+                                          ? Theme.of(context)
+                                              .colorScheme
+                                              .outline
+                                          : Theme.of(context)
+                                              .colorScheme
+                                              .onPrimary,
+                                  backgroundColor: ctr.attribute.value != 0
+                                      ? Theme.of(context)
+                                          .colorScheme
+                                          .onInverseSurface
+                                      : Theme.of(context)
+                                          .colorScheme
+                                          .primary, // 设置按钮背景色
+                                ),
+                                child: Obx(() => Text(ctr.attributeText.value)),
+                              ),
+                            ),
+                          ),
+                          const SizedBox(width: 8),
+                          Expanded(
+                            child: TextButton(
+                              onPressed: () {},
+                              style: TextButton.styleFrom(
+                                backgroundColor: Theme.of(context)
+                                    .colorScheme
+                                    .onInverseSurface,
+                              ),
+                              child: const Text('发消息'),
+                            ),
+                          )
+                        ],
+                      )
+                    ],
+                    if (ctr.ownerMid == ctr.mid && ctr.ownerMid != -1) ...[
+                      TextButton(
+                        onPressed: () {
+                          SmartDialog.showToast('功能开发中 💪');
+                        },
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.only(left: 80, right: 80),
+                          foregroundColor:
+                              Theme.of(context).colorScheme.onPrimary,
+                          backgroundColor:
+                              Theme.of(context).colorScheme.primary,
+                        ),
+                        child: const Text('编辑资料'),
+                      )
+                    ],
+                    if (ctr.ownerMid == -1) ...[
+                      TextButton(
+                        onPressed: () {},
+                        style: TextButton.styleFrom(
+                          padding: const EdgeInsets.only(left: 80, right: 80),
+                          foregroundColor:
+                              Theme.of(context).colorScheme.outline,
+                          backgroundColor:
+                              Theme.of(context).colorScheme.onInverseSurface,
+                        ),
+                        child: const Text('未登录'),
+                      )
+                    ]
+                  ],
+                ),
               ),
-            ),
+            ],
-          ],
+          ),
-        ),
+        );
-      );
+      }),
-    }),
+    );
-  );
+  }
 }

lib/pages/member/widgets/seasons.dart

@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/badge.dart';
+import 'package:pilipala/models/member/seasons.dart';
+import 'package:pilipala/pages/member_seasons/widgets/item.dart';
+
+class MemberSeasonsPanel extends StatelessWidget {
+  final MemberSeasonsDataModel? data;
+  const MemberSeasonsPanel({super.key, this.data});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      itemCount: data!.seasonsList!.length,
+      itemBuilder: (context, index) {
+        MemberSeasonsList item = data!.seasonsList![index];
+        return Padding(
+          padding: const EdgeInsets.only(bottom: 12, right: 4),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(bottom: 12, left: 4),
+                child: Row(
+                  children: [
+                    Text(
+                      item.meta!.name!,
+                      maxLines: 1,
+                      style: Theme.of(context).textTheme.titleSmall!,
+                    ),
+                    const SizedBox(width: 10),
+                    PBadge(
+                      stack: 'relative',
+                      size: 'small',
+                      text: item.meta!.total.toString(),
+                    ),
+                    const Spacer(),
+                    SizedBox(
+                      width: 35,
+                      height: 35,
+                      child: IconButton(
+                        onPressed: () => Get.toNamed(
+                            '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        ),
+                        icon: const Icon(
+                          Icons.arrow_forward,
+                          size: 20,
+                        ),
+                      ),
+                    )
+                  ],
+                ),
+              ),
+              LayoutBuilder(
+                builder: (context, boxConstraints) {
+                  return GridView.builder(
+                    gridDelegate:
+                        const SliverGridDelegateWithFixedCrossAxisCount(
+                      crossAxisCount: 2, // Use a fixed count for GridView
+                      crossAxisSpacing: StyleString.safeSpace,
+                      mainAxisSpacing: StyleString.safeSpace,
+                      childAspectRatio: 0.94,
+                    ),
+                    physics: const NeverScrollableScrollPhysics(),
+                    shrinkWrap: true,
+                    itemCount: item.archives!.length,
+                    itemBuilder: (context, i) {
+                      return MemberSeasonsItem(seasonItem: item.archives![i]);
+                    },
+                  );
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/pages/member_archive/controller.dart

@@ -1,9 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/member/archive.dart';
 
-class ArchiveController extends GetxController {
+class MemberArchiveController extends GetxController {
-  ArchiveController(this.mid);
+  final ScrollController scrollController = ScrollController();
-  int? mid;
+  late int mid;
   int pn = 1;
   int count = 0;
   RxMap<String, String> currentOrder = <String, String>{}.obs;
@@ -12,20 +14,27 @@ class ArchiveController extends GetxController {
     {'type': 'click', 'label': '最多播放'},
     {'type': 'stow', 'label': '最多收藏'},
   ];
+  RxList<VListItemModel> archivesList = <VListItemModel>[].obs;
 
   @override
   void onInit() {
     super.onInit();
-    mid ??= int.parse(Get.parameters['mid']!);
+    mid = int.parse(Get.parameters['mid']!);
-    print('🐶🐶： $mid');
     currentOrder.value = orderList.first;
   }
 
   // 获取用户投稿
-  Future getMemberArchive() async {
+  Future getMemberArchive(type) async {
+    if (type == 'onRefresh') {
+      pn = 1;
+    }
     var res = await MemberHttp.memberArchive(
-        mid: mid, pn: pn, order: currentOrder['type']!);
+      mid: mid,
+      pn: pn,
+      order: currentOrder['type']!,
+    );
     if (res['status']) {
+      archivesList.addAll(res['data'].list.vlist);
       count = res['data'].page['count'];
       pn += 1;
     }
@@ -34,11 +43,16 @@ class ArchiveController extends GetxController {
 
   toggleSort() async {
     pn = 1;
-    int index = orderList.indexOf(currentOrder.value);
+    int index = orderList.indexOf(currentOrder);
     if (index == orderList.length - 1) {
       currentOrder.value = orderList.first;
     } else {
       currentOrder.value = orderList[index + 1];
     }
   }
+
+  // 上拉加载
+  Future onLoad() async {
+    getMemberArchive('onLoad');
+  }
 }

lib/pages/member_archive/index.dart

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

lib/pages/member_archive/view.dart

@@ -0,0 +1,125 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/widgets/video_card_h.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'controller.dart';
+
+class MemberArchivePage extends StatefulWidget {
+  const MemberArchivePage({super.key});
+
+  @override
+  State<MemberArchivePage> createState() => _MemberArchivePageState();
+}
+
+class _MemberArchivePageState extends State<MemberArchivePage> {
+  late MemberArchiveController _memberArchivesController;
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+  late int mid;
+
+  @override
+  void initState() {
+    super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    final String heroTag = Utils.makeHeroTag(mid);
+    _memberArchivesController =
+        Get.put(MemberArchiveController(), tag: heroTag);
+    _futureBuilderFuture =
+        _memberArchivesController.getMemberArchive('onRefresh');
+    scrollController = _memberArchivesController.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'member_archives', const Duration(milliseconds: 500), () {
+            _memberArchivesController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('他的投稿'),
+        // actions: [
+        //   Obx(
+        //     () => PopupMenuButton<String>(
+        //       padding: EdgeInsets.zero,
+        //       tooltip: '投稿排序',
+        //       icon: Icon(
+        //         Icons.more_vert_outlined,
+        //         color: Theme.of(context).colorScheme.outline,
+        //       ),
+        //       position: PopupMenuPosition.under,
+        //       onSelected: (String type) {},
+        //       itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
+        //         for (var i in _memberArchivesController.orderList) ...[
+        //           PopupMenuItem<String>(
+        //             onTap: () {},
+        //             value: _memberArchivesController.currentOrder['label'],
+        //             child: Row(
+        //               mainAxisSize: MainAxisSize.min,
+        //               children: [
+        //                 Text(i['label']!),
+        //                 if (_memberArchivesController.currentOrder['label'] ==
+        //                     i['label']) ...[
+        //                   const SizedBox(width: 10),
+        //                   const Icon(Icons.done, size: 20),
+        //                 ],
+        //               ],
+        //             ),
+        //           ),
+        //         ]
+        //       ],
+        //     ),
+        //   ),
+        // ],
+      ),
+      body: CustomScrollView(
+        controller: _memberArchivesController.scrollController,
+        slivers: [
+          FutureBuilder(
+            future: _futureBuilderFuture,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.done) {
+                if (snapshot.data != null) {
+                  Map data = snapshot.data as Map;
+                  List list = _memberArchivesController.archivesList;
+                  if (data['status']) {
+                    return Obx(
+                      () => list.isNotEmpty
+                          ? SliverList(
+                              delegate: SliverChildBuilderDelegate(
+                                (context, index) {
+                                  return VideoCardH(
+                                    videoItem: list[index],
+                                    showOwner: false,
+                                    showPubdate: true,
+                                  );
+                                },
+                                childCount: list.length,
+                              ),
+                            )
+                          : const SliverToBoxAdapter(),
+                    );
+                  } else {
+                    return const SliverToBoxAdapter();
+                  }
+                } else {
+                  return const SliverToBoxAdapter();
+                }
+              } else {
+                return const SliverToBoxAdapter();
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/member_coin/controller.dart

@@ -0,0 +1,3 @@
+import 'package:get/get.dart';
+
+class MemberCoinController extends GetxController {}

lib/pages/member_coin/index.dart

@@ -1,4 +1,4 @@
-library dynamic_panel;
+library member_coin;
 
 export './controller.dart';
 export './view.dart';

lib/pages/member_coin/view.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class MemberCoinPage extends StatefulWidget {
+  const MemberCoinPage({super.key});
+
+  @override
+  State<MemberCoinPage> createState() => _MemberCoinPageState();
+}
+
+class _MemberCoinPageState extends State<MemberCoinPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold();
+  }
+}

lib/pages/member_coin/widgets/item.dart

@@ -0,0 +1,95 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/badge.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/member/coin.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class MemberCoinsItem extends StatelessWidget {
+  final MemberCoinsDataModel coinItem;
+
+  const MemberCoinsItem({
+    Key? key,
+    required this.coinItem,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    String heroTag = Utils.makeHeroTag(coinItem.aid);
+    return Card(
+      elevation: 0,
+      clipBehavior: Clip.hardEdge,
+      margin: EdgeInsets.zero,
+      child: InkWell(
+        onTap: () async {
+          int cid =
+              await SearchHttp.ab2c(aid: coinItem.aid, bvid: coinItem.bvid);
+          Get.toNamed('/video?bvid=${coinItem.bvid}&cid=$cid',
+              arguments: {'videoItem': coinItem, 'heroTag': heroTag});
+        },
+        child: Column(
+          children: [
+            AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(builder: (context, boxConstraints) {
+                double maxWidth = boxConstraints.maxWidth;
+                double maxHeight = boxConstraints.maxHeight;
+                return Stack(
+                  children: [
+                    NetworkImgLayer(
+                      src: coinItem.pic,
+                      width: maxWidth,
+                      height: maxHeight,
+                    ),
+                    if (coinItem.duration != null)
+                      PBadge(
+                        bottom: 6,
+                        right: 6,
+                        type: 'gray',
+                        text: Utils.timeFormat(coinItem.duration),
+                      )
+                  ],
+                );
+              }),
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(5, 6, 0, 0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    coinItem.title!,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      StatView(
+                        view: coinItem.view,
+                        theme: 'gray',
+                      ),
+                      const Spacer(),
+                      Text(
+                        Utils.CustomStamp_str(
+                            timestamp: coinItem.pubdate, date: 'MM-DD'),
+                        style: TextStyle(
+                          fontSize: 11,
+                          color: Theme.of(context).colorScheme.outline,
+                        ),
+                      ),
+                      const SizedBox(width: 6)
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/member_dynamics/controller.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/dynamics/result.dart';
+
+class MemberDynamicsController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  late int mid;
+  String offset = '';
+  int count = 0;
+  bool hasMore = true;
+  RxList<DynamicItemModel> dynamicsList = <DynamicItemModel>[].obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+  }
+
+  Future getMemberDynamic(type) async {
+    if (type == 'onRefresh') {
+      offset = '';
+      dynamicsList.clear();
+    }
+    if (offset == '-1') {
+      return;
+    }
+    var res = await MemberHttp.memberDynamic(
+      offset: offset,
+      mid: mid,
+    );
+    if (res['status']) {
+      dynamicsList.addAll(res['data'].items);
+      offset = res['data'].offset != '' ? res['data'].offset : '-1';
+      hasMore = res['data'].hasMore;
+    }
+    return res;
+  }
+
+  // 上拉加载
+  Future onLoad() async {
+    getMemberDynamic('onLoad');
+  }
+}

lib/pages/member_dynamics/index.dart

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

lib/pages/member_dynamics/view.dart

@@ -0,0 +1,95 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/pages/member_dynamics/index.dart';
+import 'package:pilipala/utils/utils.dart';
+
+import '../dynamics/widgets/dynamic_panel.dart';
+
+class MemberDynamicsPage extends StatefulWidget {
+  const MemberDynamicsPage({super.key});
+
+  @override
+  State<MemberDynamicsPage> createState() => _MemberDynamicsPageState();
+}
+
+class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
+  late MemberDynamicsController _memberDynamicController;
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+  late int mid;
+
+  @override
+  void initState() {
+    super.initState();
+    mid = int.parse(Get.parameters['mid']!);
+    final String heroTag = Utils.makeHeroTag(mid);
+    _memberDynamicController =
+        Get.put(MemberDynamicsController(), tag: heroTag);
+    _futureBuilderFuture =
+        _memberDynamicController.getMemberDynamic('onRefresh');
+    scrollController = _memberDynamicController.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'member_dynamics', const Duration(milliseconds: 1000), () {
+            _memberDynamicController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _memberDynamicController.scrollController.removeListener(() {});
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('他的动态'),
+      ),
+      body: CustomScrollView(
+        controller: _memberDynamicController.scrollController,
+        slivers: [
+          FutureBuilder(
+            future: _futureBuilderFuture,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.done) {
+                if (snapshot.data != null) {
+                  Map data = snapshot.data as Map;
+                  List list = _memberDynamicController.dynamicsList;
+                  if (data['status']) {
+                    return Obx(
+                      () => list.isNotEmpty
+                          ? SliverList(
+                              delegate: SliverChildBuilderDelegate(
+                                (context, index) {
+                                  return DynamicPanel(item: list[index]);
+                                },
+                                childCount: list.length,
+                              ),
+                            )
+                          : const SliverToBoxAdapter(),
+                    );
+                  } else {
+                    return const SliverToBoxAdapter();
+                  }
+                } else {
+                  return const SliverToBoxAdapter();
+                }
+              } else {
+                return const SliverToBoxAdapter();
+              }
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/member_like/controller.dart

@@ -0,0 +1,3 @@
+import 'package:get/get.dart';
+
+class MemberLikeController extends GetxController {}

lib/pages/member_like/index.dart

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

lib/pages/member_like/view.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+class MemberLikePage extends StatefulWidget {
+  const MemberLikePage({super.key});
+
+  @override
+  State<MemberLikePage> createState() => _MemberLikePageState();
+}
+
+class _MemberLikePageState extends State<MemberLikePage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold();
+  }
+}

lib/pages/member_seasons/controller.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/member.dart';
+import 'package:pilipala/models/member/seasons.dart';
+
+class MemberSeasonsController extends GetxController {
+  final ScrollController scrollController = ScrollController();
+  late int mid;
+  late int seasonId;
+  int pn = 1;
+  int ps = 30;
+  int count = 0;
+  RxList<MemberArchiveItem> seasonsList = <MemberArchiveItem>[].obs;
+  late Map page;
+
+  @override
+  void onInit() {
+    super.onInit();
+    mid = int.parse(Get.parameters['mid']!);
+    seasonId = int.parse(Get.parameters['seasonId']!);
+  }
+
+  // 获取专栏详情
+  Future getSeasonDetail(type) async {
+    if (type == 'onRefresh') {
+      pn = 1;
+    }
+    var res = await MemberHttp.getSeasonDetail(
+      mid: mid,
+      seasonId: seasonId,
+      pn: pn,
+      ps: ps,
+      sortReverse: false,
+    );
+    if (res['status']) {
+      seasonsList.addAll(res['data'].archives);
+      page = res['data'].page;
+      pn += 1;
+    }
+    return res;
+  }
+
+  // 上拉加载
+  Future onLoad() async {
+    getSeasonDetail('onLoad');
+  }
+}

lib/pages/member_seasons/index.dart

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

lib/pages/member_seasons/view.dart

@@ -0,0 +1,103 @@
+import 'package:easy_debounce/easy_throttle.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'controller.dart';
+import 'widgets/item.dart';
+
+class MemberSeasonsPage extends StatefulWidget {
+  const MemberSeasonsPage({super.key});
+
+  @override
+  State<MemberSeasonsPage> createState() => _MemberSeasonsPageState();
+}
+
+class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
+  final MemberSeasonsController _memberSeasonsController =
+      Get.put(MemberSeasonsController());
+  late Future _futureBuilderFuture;
+  late ScrollController scrollController;
+
+  @override
+  void initState() {
+    super.initState();
+    _futureBuilderFuture =
+        _memberSeasonsController.getSeasonDetail('onRefresh');
+    scrollController = _memberSeasonsController.scrollController;
+    scrollController.addListener(
+      () {
+        if (scrollController.position.pixels >=
+            scrollController.position.maxScrollExtent - 200) {
+          EasyThrottle.throttle(
+              'member_archives', const Duration(milliseconds: 500), () {
+            _memberSeasonsController.onLoad();
+          });
+        }
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('他的专栏'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.only(
+          left: StyleString.safeSpace,
+          right: StyleString.safeSpace,
+        ),
+        child: SingleChildScrollView(
+          controller: _memberSeasonsController.scrollController,
+          child: FutureBuilder(
+            future: _futureBuilderFuture,
+            builder: (context, snapshot) {
+              if (snapshot.connectionState == ConnectionState.done) {
+                if (snapshot.data != null) {
+                  Map data = snapshot.data as Map;
+                  List list = _memberSeasonsController.seasonsList;
+                  if (data['status']) {
+                    return Obx(
+                      () => list.isNotEmpty
+                          ? LayoutBuilder(
+                              builder: (context, boxConstraints) {
+                                return GridView.builder(
+                                  gridDelegate:
+                                      const SliverGridDelegateWithFixedCrossAxisCount(
+                                    crossAxisCount: 2,
+                                    crossAxisSpacing: StyleString.safeSpace,
+                                    mainAxisSpacing: StyleString.safeSpace,
+                                    childAspectRatio: 0.94,
+                                  ),
+                                  physics: const NeverScrollableScrollPhysics(),
+                                  shrinkWrap: true,
+                                  itemCount: _memberSeasonsController
+                                      .seasonsList.length,
+                                  itemBuilder: (context, i) {
+                                    return MemberSeasonsItem(
+                                      seasonItem: _memberSeasonsController
+                                          .seasonsList[i],
+                                    );
+                                  },
+                                );
+                              },
+                            )
+                          : const SizedBox(),
+                    );
+                  } else {
+                    return const SizedBox();
+                  }
+                } else {
+                  return const SizedBox();
+                }
+              } else {
+                return const SizedBox();
+              }
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/member_seasons/widgets/item.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/widgets/badge.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class MemberSeasonsItem extends StatelessWidget {
+  final dynamic seasonItem;
+
+  const MemberSeasonsItem({
+    Key? key,
+    required this.seasonItem,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    String heroTag = Utils.makeHeroTag(seasonItem.aid);
+    return Card(
+      elevation: 0,
+      clipBehavior: Clip.hardEdge,
+      margin: EdgeInsets.zero,
+      child: InkWell(
+        onTap: () async {
+          int cid =
+              await SearchHttp.ab2c(aid: seasonItem.aid, bvid: seasonItem.bvid);
+          Get.toNamed('/video?bvid=${seasonItem.bvid}&cid=$cid',
+              arguments: {'videoItem': seasonItem, 'heroTag': heroTag});
+        },
+        child: Column(
+          children: [
+            AspectRatio(
+              aspectRatio: StyleString.aspectRatio,
+              child: LayoutBuilder(builder: (context, boxConstraints) {
+                double maxWidth = boxConstraints.maxWidth;
+                double maxHeight = boxConstraints.maxHeight;
+                return Stack(
+                  children: [
+                    Hero(
+                      tag: heroTag,
+                      child: NetworkImgLayer(
+                        src: seasonItem.pic,
+                        width: maxWidth,
+                        height: maxHeight,
+                      ),
+                    ),
+                    if (seasonItem.duration != null)
+                      PBadge(
+                        bottom: 6,
+                        right: 6,
+                        type: 'gray',
+                        text: Utils.timeFormat(seasonItem.duration),
+                      )
+                  ],
+                );
+              }),
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(5, 6, 0, 0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    seasonItem.title,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      StatView(
+                        view: seasonItem.view,
+                        theme: 'gray',
+                      ),
+                      const Spacer(),
+                      Text(
+                        Utils.CustomStamp_str(
+                            timestamp: seasonItem.pubdate, date: 'MM-DD'),
+                        style: TextStyle(
+                          fontSize: 11,
+                          color: Theme.of(context).colorScheme.outline,
+                        ),
+                      ),
+                      const SizedBox(width: 6)
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/mine/controller.dart

@@ -129,4 +129,12 @@ class MineController extends GetxController {
     }
     Get.toNamed('/fan?mid=${userInfo.value.mid}');
   }
+
+  pushDynamic() {
+    if (!userLogin.value) {
+      SmartDialog.showToast('账号未登录');
+      return;
+    }
+    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}');
+  }
 }

lib/pages/mine/view.dart

@@ -234,7 +234,7 @@ class _MinePageState extends State<MinePage> {
                   childAspectRatio: 1.67,
                   children: <Widget>[
                     InkWell(
-                      onTap: () {},
+                      onTap: () => _mineController.pushDynamic(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,

lib/pages/preview/view.dart

@@ -159,7 +159,6 @@ class _ImagePreviewState extends State<ImagePreview>
                     _previewController.onChange(index),
                 canScrollPage: (GestureDetails? gestureDetails) =>
                     gestureDetails!.totalScale! <= 1.0,
-                preloadPagesCount: 2,
                 itemCount: widget.imgList!.length,
                 itemBuilder: (BuildContext context, int index) {
                   return ExtendedImage.network(

lib/pages/rcmd/controller.dart

@@ -3,12 +3,14 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/home/rcmd/result.dart';
+// import 'package:pilipala/models/model_rec_video_item.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class RcmdController extends GetxController {
   final ScrollController scrollController = ScrollController();
   int _currentPage = 0;
   RxList<RecVideoItemAppModel> videoList = <RecVideoItemAppModel>[].obs;
+  // RxList<RecVideoItemModel> videoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
   Box recVideo = GStrorage.recVideo;
@@ -21,6 +23,7 @@ class RcmdController extends GetxController {
     super.onInit();
     crossAxisCount.value =
         setting.get(SettingBoxKey.customRows, defaultValue: 2);
+    // 读取app端缓存内容
     if (recVideo.get('cacheList') != null &&
         recVideo.get('cacheList').isNotEmpty) {
       List<RecVideoItemAppModel> list = [];
@@ -35,6 +38,11 @@ class RcmdController extends GetxController {
 
   // 获取推荐
   Future queryRcmdFeed(type) async {
+    return await queryRcmdFeedApp(type);
+  }
+
+  // 获取app端推荐
+  Future queryRcmdFeedApp(type) async {
     if (isLoadingMore == false) {
       return;
     }
@@ -67,6 +75,40 @@ class RcmdController extends GetxController {
     return res;
   }
 
+  // 获取web端推荐
+  Future queryRcmdFeedWeb(type) async {
+    if (isLoadingMore == false) {
+      return;
+    }
+    if (type == 'onRefresh') {
+      _currentPage = 0;
+    }
+    var res = await VideoHttp.rcmdVideoList(
+      ps: 20,
+      freshIdx: _currentPage,
+    );
+    if (res['status']) {
+      if (type == 'init') {
+        if (videoList.isNotEmpty) {
+          videoList.addAll(res['data']);
+        } else {
+          videoList.value = res['data'];
+        }
+      } else if (type == 'onRefresh') {
+        if (enableSaveLastData) {
+          videoList.insertAll(0, res['data']);
+        } else {
+          videoList.value = res['data'];
+        }
+      } else if (type == 'onLoad') {
+        videoList.addAll(res['data']);
+      }
+      _currentPage += 1;
+    }
+    isLoadingMore = false;
+    return res;
+  }
+
   // 下拉刷新
   Future onRefresh() async {
     isLoadingMore = true;

lib/pages/rcmd/view.dart

@@ -11,6 +11,7 @@ import 'package:pilipala/common/widgets/animated_dialog.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/overlay_pop.dart';
 import 'package:pilipala/common/widgets/video_card_v.dart';
+import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/main/index.dart';
 
 import 'controller.dart';
@@ -37,6 +38,8 @@ class _RcmdPageState extends State<RcmdPage>
     ScrollController scrollController = _rcmdController.scrollController;
     StreamController<bool> mainStream =
         Get.find<MainController>().bottomBarStream;
+    StreamController<bool> searchBarStream =
+        Get.find<HomeController>().searchBarStream;
     scrollController.addListener(
       () {
         if (scrollController.position.pixels >=
@@ -47,13 +50,14 @@ class _RcmdPageState extends State<RcmdPage>
             _rcmdController.onLoad();
           });
         }
-
         final ScrollDirection direction =
             scrollController.position.userScrollDirection;
         if (direction == ScrollDirection.forward) {
           mainStream.add(true);
+          searchBarStream.add(true);
         } else if (direction == ScrollDirection.reverse) {
           mainStream.add(false);
+          searchBarStream.add(false);
         }
       },
     );
@@ -82,6 +86,7 @@ class _RcmdPageState extends State<RcmdPage>
         },
         child: CustomScrollView(
           controller: _rcmdController.scrollController,
+          physics: const AlwaysScrollableScrollPhysics(),
           slivers: [
             SliverPadding(
               padding:
@@ -152,11 +157,10 @@ class _RcmdPageState extends State<RcmdPage>
     //   crossAxisCount = 1;
     // }
     int crossAxisCount = ctr.crossAxisCount.value;
-    double mainAxisExtent =
+    double mainAxisExtent = (Get.size.width /
-        (Get.size.width / crossAxisCount / StyleString.aspectRatio) +
+            crossAxisCount /
-            (crossAxisCount == 1
+            StyleString.aspectRatio) +
-                ? 68
+        (crossAxisCount == 1 ? 68 : MediaQuery.textScalerOf(context).scale(86));
-                : 86 * MediaQuery.of(context).textScaleFactor);
     return SliverGrid(
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
         // 行间距
@@ -191,8 +195,8 @@ class _RcmdPageState extends State<RcmdPage>
 }
 
 class LoadingMore extends StatelessWidget {
-  dynamic ctr;
+  final dynamic ctr;
-  LoadingMore({super.key, this.ctr});
+  const LoadingMore({super.key, this.ctr});
 
   @override
   Widget build(BuildContext context) {
@@ -203,12 +207,13 @@ class LoadingMore extends StatelessWidget {
         child: GestureDetector(
           onTap: () {
             if (ctr != null) {
+              ctr!.isLoadingMore = true;
               ctr!.onLoad();
             }
           },
           child: Center(
             child: Text(
-              '加载更多 👇',
+              '点击加载更多 👇',
               style: TextStyle(
                   color: Theme.of(context).colorScheme.outline, fontSize: 13),
             ),

lib/pages/search/view.dart

@@ -160,25 +160,25 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
   }
 
   Widget _searchSuggest() {
-    SSearchController _ssCtr = _searchController;
+    SSearchController ssCtr = _searchController;
     return Obx(
-      () => _ssCtr.searchSuggestList.isNotEmpty &&
+      () => ssCtr.searchSuggestList.isNotEmpty &&
-              _ssCtr.searchSuggestList.first.term != null &&
+              ssCtr.searchSuggestList.first.term != null &&
-              _ssCtr.controller.value.text != ''
+              ssCtr.controller.value.text != ''
           ? ListView.builder(
               physics: const NeverScrollableScrollPhysics(),
               shrinkWrap: true,
-              itemCount: _ssCtr.searchSuggestList.length,
+              itemCount: ssCtr.searchSuggestList.length,
               itemBuilder: (context, index) {
                 return InkWell(
                   customBorder: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(4),
                   ),
-                  onTap: () => _ssCtr
+                  onTap: () => ssCtr
-                      .onClickKeyword(_ssCtr.searchSuggestList[index].term!),
+                      .onClickKeyword(ssCtr.searchSuggestList[index].term!),
                   child: Padding(
                     padding: const EdgeInsets.only(left: 20, top: 9, bottom: 9),
-                    child: _ssCtr.searchSuggestList[index].textRich,
+                    child: ssCtr.searchSuggestList[index].textRich,
                   ),
                 );
               },
@@ -235,6 +235,7 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                       return Obx(
                         () => HotKeyword(
                           width: width,
+                          // ignore: invalid_use_of_protected_member
                           hotSearchList: _searchController.hotSearchList.value,
                           onClick: (keyword) async {
                             _searchController.searchFocusNode.unfocus();

lib/pages/searchPanel/view.dart

@@ -83,6 +83,7 @@ class _SearchPanelState extends State<SearchPanel>
                   case SearchType.video:
                     return SearchVideoPanel(
                       ctr: _searchPanelController,
+                      // ignore: invalid_use_of_protected_member
                       list: list.value,
                     );
                   case SearchType.media_bangumi:

lib/pages/searchResult/view.dart

@@ -82,6 +82,7 @@ class _SearchResultPageState extends State<SearchResultPage>
                 labelStyle: const TextStyle(fontSize: 13),
                 dividerColor: Colors.transparent,
                 unselectedLabelColor: Theme.of(context).colorScheme.outline,
+                tabAlignment: TabAlignment.start,
                 onTap: (index) {
                   if (index == _searchResultController!.tabIndex) {
                     Get.find<SearchPanelController>(

lib/pages/setting/extra_setting.dart

@@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/dynamics_type.dart';
 import 'package:pilipala/models/common/reply_sort_type.dart';
+import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import 'widgets/switch_item.dart';
@@ -169,6 +170,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableSaveLastData,
             defaultVal: false,
           ),
+          const SetSwitchItem(
+            title: '启用ai总结',
+            subTitle: '视频详情页开启ai总结',
+            setKey: SettingBoxKey.enableAi,
+            defaultVal: true,
+          ),
           ListTile(
             dense: false,
             title: Text('评论展示', style: titleStyle),
@@ -176,23 +183,21 @@ class _ExtraSettingState extends State<ExtraSetting> {
               '当前优先展示「${ReplySortType.values[defaultReplySort].titles}」',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultReplySort,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultReplySort = item;
+                  return SelectDialog<int>(title: '评论展示', value: defaultReplySort, values: ReplySortType.values.map((e) {
-                setting.put(SettingBoxKey.replySortType, item);
+                    return {'title': e.titles, 'value': e.index};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultReplySort = result;
+                setting.put(SettingBoxKey.replySortType, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in ReplySortType.values) ...[
-                  PopupMenuItem(
-                    value: i.index,
-                    child: Text(i.titles),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -201,23 +206,21 @@ class _ExtraSettingState extends State<ExtraSetting> {
               '当前优先展示「${DynamicsType.values[defaultDynamicType].labels}」',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultDynamicType,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultDynamicType = item;
+                  return SelectDialog<int>(title: '动态展示', value: defaultDynamicType, values: DynamicsType.values.map((e) {
-                setting.put(SettingBoxKey.defaultDynamicType, item);
+                    return {'title': e.labels, 'value': e.index};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultDynamicType = result;
+                setting.put(SettingBoxKey.defaultDynamicType, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in DynamicsType.values) ...[
-                  PopupMenuItem(
-                    value: i.index,
-                    child: Text(i.labels),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             enableFeedback: true,
@@ -225,6 +228,7 @@ class _ExtraSettingState extends State<ExtraSetting> {
             title: Text('设置代理', style: titleStyle),
             subtitle: Text('设置代理 host:port', style: subTitleStyle),
             trailing: Transform.scale(
+              alignment: Alignment.centerRight,
               scale: 0.8,
               child: Switch(
                 thumbIcon: MaterialStateProperty.resolveWith<Icon?>(

lib/pages/setting/pages/font_size_select.dart

@@ -44,12 +44,10 @@ class _FontSizeSelectPageState extends State<FontSizeSelectPage> {
       body: Column(
         children: [
           Expanded(
-            child: SingleChildScrollView(
+            child: Center(
-              child: Center(
+              child: Text(
-                child: Text(
+                '当前字体大小:${currentSize == 1.0 ? '默认' : currentSize}',
-                  '当前字体大小:${currentSize == 1.0 ? '默认' : currentSize}',
+                style: TextStyle(fontSize: 14 * currentSize),
-                  style: TextStyle(fontSize: 14 * currentSize),
-                ),
               ),
             ),
           ),

lib/pages/setting/pages/play_speed_set.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/pages/setting/widgets/switch_item.dart';
+import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_speed.dart';
 import 'package:pilipala/utils/storage.dart';
 
@@ -13,9 +15,11 @@ class PlaySpeedPage extends StatefulWidget {
 
 class _PlaySpeedPageState extends State<PlaySpeedPage> {
   Box videoStorage = GStrorage.video;
+  Box settingStorage = GStrorage.setting;
   late double playSpeedDefault;
   late double longPressSpeedDefault;
   late List customSpeedsList;
+  late bool enableAutoLongPressSpeed;
   List<Map<dynamic, dynamic>> sheetMenu = [
     {
       'id': 1,
@@ -24,6 +28,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         Icons.speed,
         size: 21,
       ),
+      'show': true,
     },
     {
       'id': 2,
@@ -32,6 +37,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         Icons.speed_sharp,
         size: 21,
       ),
+      'show': true,
     },
     {
       'id': -1,
@@ -40,6 +46,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         Icons.delete_outline,
         size: 21,
       ),
+      'show': true,
     },
   ];
 
@@ -55,6 +62,15 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
     // 自定义倍速
     customSpeedsList =
         videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
+    enableAutoLongPressSpeed = settingStorage
+        .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
+    if (enableAutoLongPressSpeed) {
+      Map newItem = sheetMenu[1];
+      newItem['show'] = false;
+      setState(() {
+        sheetMenu[1] = newItem;
+      });
+    }
   }
 
   // 添加自定义倍速
@@ -120,19 +136,21 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
             //重要
             itemCount: sheetMenu.length,
             itemBuilder: (BuildContext context, int index) {
-              return ListTile(
+              return sheetMenu[index]['show']
-                onTap: () {
+                  ? ListTile(
-                  Navigator.pop(context);
+                      onTap: () {
-                  menuAction(type, i, sheetMenu[index]['id']);
+                        Navigator.pop(context);
-                },
+                        menuAction(type, i, sheetMenu[index]['id']);
-                minLeadingWidth: 0,
+                      },
-                iconColor: Theme.of(context).colorScheme.onSurface,
+                      minLeadingWidth: 0,
-                leading: sheetMenu[index]['leading'],
+                      iconColor: Theme.of(context).colorScheme.onSurface,
-                title: Text(
+                      leading: sheetMenu[index]['leading'],
-                  sheetMenu[index]['title'],
+                      title: Text(
-                  style: Theme.of(context).textTheme.titleSmall,
+                        sheetMenu[index]['title'],
-                ),
+                        style: Theme.of(context).textTheme.titleSmall,
-              );
+                      ),
+                    )
+                  : const SizedBox();
             },
           ),
         );
@@ -210,11 +228,27 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
               title: const Text('默认倍速'),
               subtitle: Text(playSpeedDefault.toString()),
             ),
-            ListTile(
+            SetSwitchItem(
-              dense: false,
+              title: '动态长按倍速',
-              title: const Text('默认长按倍速'),
+              subTitle: '根据默认倍速长按时自动双倍',
-              subtitle: Text(longPressSpeedDefault.toString()),
+              setKey: SettingBoxKey.enableAutoLongPressSpeed,
+              defaultVal: enableAutoLongPressSpeed,
+              callFn: (val) {
+                Map newItem = sheetMenu[1];
+                val ? newItem['show'] = false : newItem['show'] = true;
+                setState(() {
+                  sheetMenu[1] = newItem;
+                  enableAutoLongPressSpeed = val;
+                });
+              },
             ),
+            !enableAutoLongPressSpeed
+                ? ListTile(
+                    dense: false,
+                    title: const Text('默认长按倍速'),
+                    subtitle: Text(longPressSpeedDefault.toString()),
+                  )
+                : const SizedBox(),
             Padding(
               padding: const EdgeInsets.only(
                 left: 14,

lib/pages/setting/play_setting.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/video/play/quality.dart';
+import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -68,7 +69,7 @@ class _PlaySettingState extends State<PlaySetting> {
             dense: false,
             onTap: () => Get.toNamed('/playSpeedSet'),
             title: Text('倍速设置', style: titleStyle),
-            trailing: const Icon(Icons.arrow_forward_ios, size: 17),
+            subtitle: Text('设置视频播放速度', style: subTitleStyle),
           ),
           const SetSwitchItem(
             title: '开启1080P',
@@ -96,7 +97,7 @@ class _PlaySettingState extends State<PlaySetting> {
           ),
           const SetSwitchItem(
             title: '自动PiP播放',
-            subTitle: 'app切换至后台时画中画播放',
+            subTitle: '进入后台时画中画播放',
             setKey: SettingBoxKey.autoPiP,
             defaultVal: false,
           ),
@@ -149,23 +150,21 @@ class _PlaySettingState extends State<PlaySetting> {
               '当前画质${VideoQualityCode.fromCode(defaultVideoQa)!.description!}',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultVideoQa,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultVideoQa = item;
+                  return SelectDialog<int>(title: '默认画质', value: defaultVideoQa, values: VideoQuality.values.reversed.map((e) {
-                setting.put(SettingBoxKey.defaultVideoQa, item);
+                    return {'title': e.description, 'value': e.code};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultVideoQa = result;
+                setting.put(SettingBoxKey.defaultVideoQa, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in VideoQuality.values.reversed) ...[
-                  PopupMenuItem(
-                    value: i.code,
-                    child: Text(i.description),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -174,23 +173,21 @@ class _PlaySettingState extends State<PlaySetting> {
               '当前音质${AudioQualityCode.fromCode(defaultAudioQa)!.description!}',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultAudioQa,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultAudioQa = item;
+                  return SelectDialog<int>(title: '默认音质', value: defaultAudioQa, values: AudioQuality.values.reversed.map((e) {
-                setting.put(SettingBoxKey.defaultAudioQa, item);
+                    return {'title': e.description, 'value': e.code};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultAudioQa = result;
+                setting.put(SettingBoxKey.defaultAudioQa, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in AudioQuality.values.reversed) ...[
-                  PopupMenuItem(
-                    value: i.code,
-                    child: Text(i.description),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -199,23 +196,21 @@ class _PlaySettingState extends State<PlaySetting> {
               '当前解码格式${VideoDecodeFormatsCode.fromCode(defaultDecode)!.description!}',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultDecode,
+              String? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultDecode = item;
+                  return SelectDialog<String>(title: '默认解码格式', value: defaultDecode, values: VideoDecodeFormats.values.map((e) {
-                setting.put(SettingBoxKey.defaultDecode, item);
+                    return {'title': e.description, 'value': e.code};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultDecode = result;
+                setting.put(SettingBoxKey.defaultDecode, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in VideoDecodeFormats.values) ...[
-                  PopupMenuItem(
-                    value: i.code,
-                    child: Text(i.description),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -224,23 +219,21 @@ class _PlaySettingState extends State<PlaySetting> {
               '当前全屏方式：${FullScreenModeCode.fromCode(defaultFullScreenMode)!.description}',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultFullScreenMode,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultFullScreenMode = item;
+                  return SelectDialog<int>(title: '默认全屏方式', value: defaultFullScreenMode, values: FullScreenMode.values.map((e) {
-                setting.put(SettingBoxKey.fullScreenMode, item);
+                    return {'title': e.description, 'value': e.code};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultFullScreenMode = result;
+                setting.put(SettingBoxKey.fullScreenMode, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in FullScreenMode.values) ...[
-                  PopupMenuItem(
-                    value: i.code,
-                    child: Text(i.description),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -249,23 +242,21 @@ class _PlaySettingState extends State<PlaySetting> {
               '当前展示方式：${BtmProgresBehaviorCode.fromCode(defaultBtmProgressBehavior)!.description}',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
+            onTap: () async {
-              initialValue: defaultBtmProgressBehavior,
+              int? result = await showDialog(
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
+                context: context,
-              onSelected: (item) {
+                builder: (context) {
-                defaultBtmProgressBehavior = item;
+                  return SelectDialog<int>(title: '底部进度条展示', value: defaultBtmProgressBehavior, values: BtmProgresBehavior.values.map((e) {
-                setting.put(SettingBoxKey.btmProgressBehavior, item);
+                    return {'title': e.description, 'value': e.code};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultBtmProgressBehavior = result;
+                setting.put(SettingBoxKey.btmProgressBehavior, result);
                 setState(() {});
-              },
+              }
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+            },
-                for (var i in BtmProgresBehavior.values) ...[
-                  PopupMenuItem(
-                    value: i.code,
-                    child: Text(i.description),
-                  ),
-                ]
-              ],
-            ),
           ),
         ],
       ),

lib/pages/setting/privacy_setting.dart

@@ -2,6 +2,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/http/member.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class PrivacySetting extends StatefulWidget {
@@ -53,6 +54,16 @@ class _PrivacySettingState extends State<PrivacySetting> {
             title: Text('黑名单管理', style: titleStyle),
             subtitle: Text('已拉黑用户', style: subTitleStyle),
           ),
+          ListTile(
+            onTap: () {
+              if (!userLogin) {
+                SmartDialog.showToast('请先登录');
+              }
+              MemberHttp.cookieToKey();
+            },
+            dense: false,
+            title: Text('刷新access_key', style: titleStyle),
+          ),
         ],
       ),
     );

lib/pages/setting/style_setting.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/theme_type.dart';
+import 'package:pilipala/pages/setting/pages/color_select.dart';
+import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import 'controller.dart';
@@ -18,6 +20,8 @@ class StyleSetting extends StatefulWidget {
 
 class _StyleSettingState extends State<StyleSetting> {
   final SettingController settingController = Get.put(SettingController());
+  final ColorSelectController colorSelectController = Get.put(ColorSelectController());
+
   Box setting = GStrorage.setting;
   late int picQuality;
   late ThemeType _tempThemeValue;
@@ -56,6 +60,7 @@ class _StyleSettingState extends State<StyleSetting> {
               title: const Text('震动反馈'),
               subtitle: Text('请确定手机设置中已开启震动反馈', style: subTitleStyle),
               trailing: Transform.scale(
+                alignment: Alignment.centerRight,
                 scale: 0.8,
                 child: Switch(
                     thumbIcon: MaterialStateProperty.resolveWith<Icon?>(
@@ -83,37 +88,42 @@ class _StyleSettingState extends State<StyleSetting> {
             setKey: SettingBoxKey.enableMYBar,
             defaultVal: true,
           ),
-          // SetSwitchItem(
+          const SetSwitchItem(
-          //   title: '首页单列',
+            title: '首页顶栏收起',
-          //   subTitle: '每行展示一个内容卡片',
+            subTitle: '首页列表滑动时，收起顶栏',
-          //   setKey: SettingBoxKey.enableSingleRow,
+            setKey: SettingBoxKey.hideSearchBar,
-          //   defaultVal: false,
+            defaultVal: true,
-          //   callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
+            needReboot: true,
-          // ),
+          ),
+          const SetSwitchItem(
+            title: '首页底栏收起',
+            subTitle: '首页列表滑动时，收起底栏',
+            setKey: SettingBoxKey.hideTabBar,
+            defaultVal: true,
+            needReboot: true,
+          ),
           ListTile(
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(title: '自定义列数', value: defaultCustomRows, values: [1, 2, 3, 4, 5].map((e) {
+                    return {'title': '$e 列', 'value': e};
+                  }).toList());
+                },
+              );
+              if (result != null) {
+                defaultCustomRows = result;
+                setting.put(SettingBoxKey.customRows, result);
+                setState(() {});
+              }
+            },
             dense: false,
             title: Text('自定义列数', style: titleStyle),
             subtitle: Text(
-              '当前列数',
+              '当前列数 $defaultCustomRows 列',
               style: subTitleStyle,
             ),
-            trailing: PopupMenuButton(
-              initialValue: defaultCustomRows,
-              icon: const Icon(Icons.more_vert_outlined, size: 22),
-              onSelected: (item) {
-                defaultCustomRows = item;
-                setting.put(SettingBoxKey.customRows, item);
-                setState(() {});
-              },
-              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-                for (var i in [1, 2, 3, 4, 5]) ...[
-                  PopupMenuItem(
-                    value: i,
-                    child: Text(i.toString()),
-                  ),
-                ]
-              ],
-            ),
           ),
           ListTile(
             dense: false,
@@ -169,88 +179,58 @@ class _StyleSettingState extends State<StyleSetting> {
             },
             title: Text('图片质量', style: titleStyle),
             subtitle: Text('选择合适的图片清晰度，上限100%', style: subTitleStyle),
-            trailing: Obx(
+            trailing: Padding(
-              () => Text(
+              padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                '${settingController.picQuality.value}%',
+              child: Obx(
-                style: Theme.of(context).textTheme.titleSmall,
+                () => Text(
+                  '${settingController.picQuality.value}%',
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
               ),
             ),
           ),
           ListTile(
             dense: false,
-            onTap: () {
+            onTap: () async {
-              showDialog(
+              ThemeType? result = await showDialog(
                 context: context,
                 builder: (context) {
-                  return AlertDialog(
+                  return SelectDialog<ThemeType>(title: '主题模式', value: _tempThemeValue, values: ThemeType.values.map((e) {
-                    title: const Text('主题模式'),
+                    return {'title': e.description, 'value': e};
-                    contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
+                  }).toList());
-                    content: StatefulBuilder(
-                        builder: (context, StateSetter setState) {
-                      return Column(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          for (var i in ThemeType.values) ...[
-                            RadioListTile(
-                              value: i,
-                              title: Text(i.description, style: titleStyle),
-                              groupValue: _tempThemeValue,
-                              onChanged: (ThemeType? value) {
-                                setState(() {
-                                  _tempThemeValue = i;
-                                });
-                              },
-                            ),
-                          ]
-                        ],
-                      );
-                    }),
-                    actions: [
-                      TextButton(
-                          onPressed: () => Navigator.pop(context),
-                          child: Text(
-                            '取消',
-                            style: TextStyle(
-                                color: Theme.of(context).colorScheme.outline),
-                          )),
-                      TextButton(
-                          onPressed: () {
-                            settingController.themeType.value = _tempThemeValue;
-                            setting.put(
-                                SettingBoxKey.themeMode, _tempThemeValue.code);
-                            Get.forceAppUpdate();
-                            Get.back();
-                          },
-                          child: const Text('确定'))
-                    ],
-                  );
                 },
               );
+              if (result != null) {
+                _tempThemeValue = result;
+                settingController.themeType.value = result;
+                setting.put(
+                    SettingBoxKey.themeMode, result.code);
+                Get.forceAppUpdate();
+              }
             },
             title: Text('主题模式', style: titleStyle),
             subtitle: Obx(() => Text(
                 '当前模式：${settingController.themeType.value.description}',
                 style: subTitleStyle)),
-            trailing: const Icon(Icons.arrow_right_alt_outlined),
           ),
           ListTile(
             dense: false,
             onTap: () => Get.toNamed('/colorSetting'),
             title: Text('应用主题', style: titleStyle),
-            trailing: const Icon(Icons.arrow_forward_ios, size: 17),
+            subtitle: Obx(() => Text(
+                '当前主题：${colorSelectController.type.value == 0 ? '动态取色': '指定颜色'}',
+                style: subTitleStyle)),
           ),
           ListTile(
             dense: false,
             onTap: () => Get.toNamed('/fontSizeSetting'),
             title: Text('字体大小', style: titleStyle),
-            trailing: const Icon(Icons.arrow_forward_ios, size: 17),
           ),
           if (Platform.isAndroid)
             ListTile(
               dense: false,
               onTap: () => Get.toNamed('/displayModeSetting'),
               title: Text('屏幕帧率', style: titleStyle),
-              trailing: const Icon(Icons.arrow_forward_ios, size: 17),
             )
         ],
       ),

lib/pages/setting/widgets/select_dialog.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:pilipala/models/common/theme_type.dart';
+
+class SelectDialog<T> extends StatefulWidget {
+  final T value;
+  final String title;
+  final List<dynamic> values;
+  const SelectDialog({super.key, required this.value, required this.values, required this.title});
+
+  @override
+  _SelectDialogState<T> createState() => _SelectDialogState<T>();
+}
+
+class _SelectDialogState<T> extends State<SelectDialog<T>> {
+
+  late T _tempValue;
+
+  @override
+  void initState() {
+    super.initState();
+    _tempValue = widget.value;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
+
+    return AlertDialog(
+      title: Text(widget.title),
+      contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 12),
+      content: StatefulBuilder(
+          builder: (context, StateSetter setState) {
+            return SingleChildScrollView(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  for (var i in widget.values) ...[
+                    RadioListTile(
+                      value: i['value'],
+                      title: Text(i['title'], style: titleStyle),
+                      groupValue: _tempValue,
+                      onChanged: (value) {
+                        print(value);
+                        setState(() {
+                          _tempValue = value as T;
+                        });
+                      },
+                    ),
+                  ]
+                ],
+              ),
+            );
+          }),
+      actions: [
+        TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(
+              '取消',
+              style: TextStyle(
+                  color: Theme.of(context).colorScheme.outline),
+            )),
+        TextButton(
+            onPressed: () => Navigator.pop(context, _tempValue),
+            child: const Text('确定'))
+      ],
+    );
+  }
+}

lib/pages/setting/widgets/switch_item.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -9,6 +10,7 @@ class SetSwitchItem extends StatefulWidget {
   final String? setKey;
   final bool? defaultVal;
   final Function? callFn;
+  final bool? needReboot;
 
   const SetSwitchItem({
     this.title,
@@ -16,6 +18,7 @@ class SetSwitchItem extends StatefulWidget {
     this.setKey,
     this.defaultVal,
     this.callFn,
+    this.needReboot,
     Key? key,
   }) : super(key: key);
 
@@ -43,6 +46,9 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
     if (widget.callFn != null) {
       widget.callFn!.call(val);
     }
+    if (widget.needReboot != null && widget.needReboot!) {
+      SmartDialog.showToast('重启生效');
+    }
     setState(() {});
   }
 
@@ -61,6 +67,7 @@ class _SetSwitchItemState extends State<SetSwitchItem> {
           ? Text(widget.subTitle!, style: subTitleStyle)
           : null,
       trailing: Transform.scale(
+        alignment: Alignment.centerRight, // 缩放Switch的大小后保持右侧对齐, 避免右侧空隙过大
         scale: 0.8,
         child: Switch(
           thumbIcon: MaterialStateProperty.resolveWith<Icon?>(

lib/pages/video/detail/controller.dart

@@ -138,8 +138,8 @@ class VideoDetailController extends GetxController
   }
 
   showReplyReplyPanel() {
-    PersistentBottomSheetController<void>? ctr =
+    PersistentBottomSheetController? ctr =
-        scaffoldKey.currentState?.showBottomSheet<void>((BuildContext context) {
+        scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
         oid: oid,
         rpid: fRpid,

lib/pages/video/detail/introduction/controller.dart

@@ -76,6 +76,7 @@ class VideoIntroController extends GetxController {
       if (Get.arguments.containsKey('videoItem')) {
         preRender = true;
         var args = Get.arguments['videoItem'];
+        var keys = Get.arguments.keys.toList();
         videoItem!['pic'] = args.pic;
         if (args.title is String) {
           videoItem!['title'] = args.title;
@@ -86,11 +87,9 @@ class VideoIntroController extends GetxController {
           }
           videoItem!['title'] = str;
         }
-        if (args.stat != null) {
+        videoItem!['stat'] = keys.contains('stat') && args.stat;
-          videoItem!['stat'] = args.stat;
+        videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate;
-        }
+        videoItem!['owner'] = keys.contains('owner') && args.owner;
-        videoItem!['pubdate'] = args.pubdate;
-        videoItem!['owner'] = args.owner;
       }
     }
     userLogin = userInfo != null;
@@ -445,6 +444,7 @@ class VideoIntroController extends GetxController {
                             label: '设置分组',
                             onPressed: setFollowGroup,
                           ),
+                          showCloseIcon: true,
                         ),
                       );
                     }
@@ -569,13 +569,7 @@ class VideoIntroController extends GetxController {
       upMid: videoDetail.value.owner!.mid!,
     );
     if (res['status']) {
-      if (res['data'].modelResult.resultType == 0) {
+      modelResult = res['data'].modelResult;
-        SmartDialog.showToast('该视频不支持ai总结');
-      }
-      if (res['data'].modelResult.resultType == 2 ||
-          res['data'].modelResult.resultType == 1) {
-        modelResult = res['data'].modelResult;
-      }
     }
     SmartDialog.dismiss();
     return res;

lib/pages/video/detail/introduction/view.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@@ -12,7 +14,6 @@ import 'package:pilipala/common/widgets/stat/view.dart';
 import 'package:pilipala/models/video_detail_res.dart';
 import 'package:pilipala/pages/video/detail/introduction/controller.dart';
 import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
-import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
@@ -134,7 +135,15 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   late final dynamic followStatus;
   late int mid;
   late String memberHeroTag;
-
+  late bool enableAi;
+  bool isProcessing = false;
+  void Function()? handleState(Future Function() action) {
+    return isProcessing ? null : () async {
+      setState(() => isProcessing = true);
+      await action();
+      setState(() => isProcessing = false);
+    };
+  }
   @override
   void initState() {
     super.initState();
@@ -150,6 +159,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         ? '-'
         : Utils.numFormat(videoIntroController.userStat['follower']);
     followStatus = videoIntroController.followStatus;
+    enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
   }
 
   // 收藏
@@ -247,7 +257,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
       sliver: SliverToBoxAdapter(
-        child: !loadingStatus || videoItem.isNotEmpty
+        child: !loadingStatus
             ? Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -277,7 +287,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                             children: [
                               StatView(
                                 theme: 'gray',
-                                view: !widget.loadingStatus
+                                view: !loadingStatus
                                     ? widget.videoDetail!.stat!.view
                                     : videoItem['stat'].view,
                                 size: 'medium',
@@ -285,7 +295,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                               const SizedBox(width: 10),
                               StatDanMu(
                                 theme: 'gray',
-                                danmu: !widget.loadingStatus
+                                danmu: !loadingStatus
                                     ? widget.videoDetail!.stat!.danmaku
                                     : videoItem['stat'].danmaku,
                                 size: 'medium',
@@ -293,7 +303,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                               const SizedBox(width: 10),
                               Text(
                                 Utils.dateFormat(
-                                    !widget.loadingStatus
+                                    !loadingStatus
                                         ? widget.videoDetail!.pubdate
                                         : videoItem['pubdate'],
                                     formatType: 'detail'),
@@ -317,23 +327,22 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                           ),
                         ),
                       ),
-                      Positioned(
+                      if (enableAi)
-                        right: 10,
+                        Positioned(
-                        top: 6,
+                          right: 10,
-                        child: GestureDetector(
+                          top: 6,
-                          onTap: () async {
+                          child: GestureDetector(
-                            var res = await videoIntroController.aiConclusion();
+                            onTap: () async {
-                            if (res['status']) {
+                              var res =
-                              if (res['data'].modelResult.resultType == 2 ||
+                                  await videoIntroController.aiConclusion();
-                                  res['data'].modelResult.resultType == 1) {
+                              if (res['status']) {
                                 showAiBottomSheet();
                               }
-                            }
+                            },
-                          },
+                            child:
-                          child:
+                                Image.asset('assets/images/ai.png', height: 22),
-                              Image.asset('assets/images/ai.png', height: 22),
+                          ),
-                        ),
+                        )
-                      )
                     ],
                   ),
                   // 点赞收藏转发 布局样式1
@@ -477,7 +486,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.thumbsUp),
                   selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                  onTap: () => videoIntroController.actionLikeVideo(),
+                  onTap: handleState(videoIntroController.actionLikeVideo),
                   selectStatus: videoIntroController.hasLike.value,
                   loadingStatus: loadingStatus,
                   text: !loadingStatus
@@ -494,7 +503,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
               () => ActionItem(
                   icon: const Icon(FontAwesomeIcons.b),
                   selectIcon: const Icon(FontAwesomeIcons.b),
-                  onTap: () => videoIntroController.actionCoinVideo(),
+                  onTap: handleState(videoIntroController.actionCoinVideo),
                   selectStatus: videoIntroController.hasCoin.value,
                   loadingStatus: loadingStatus,
                   text: !loadingStatus
@@ -538,7 +547,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: () => videoIntroController.actionLikeVideo(),
+          onTap: handleState(videoIntroController.actionLikeVideo),
           selectStatus: videoIntroController.hasLike.value,
           loadingStatus: loadingStatus,
           text:
@@ -549,7 +558,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       Obx(
         () => ActionRowItem(
           icon: const Icon(FontAwesomeIcons.b),
-          onTap: () => videoIntroController.actionCoinVideo(),
+          onTap: handleState(videoIntroController.actionCoinVideo),
           selectStatus: videoIntroController.hasCoin.value,
           loadingStatus: loadingStatus,
           text:

lib/pages/video/detail/introduction/widgets/page.dart

@@ -27,6 +27,7 @@ class _PagesPanelState extends State<PagesPanel> {
   late int currentIndex;
   String heroTag = Get.arguments['heroTag'];
   late VideoDetailController _videoDetailController;
+  final ScrollController _scrollController = ScrollController();
 
   @override
   void initState() {
@@ -50,6 +51,12 @@ class _PagesPanelState extends State<PagesPanel> {
     setState(() {});
   }
 
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -80,73 +87,92 @@ class _PagesPanelState extends State<PagesPanel> {
                   onPressed: () {
                     showBottomSheet(
                       context: context,
-                      builder: (_) => Container(
+                      builder: (BuildContext context) {
-                        height: widget.sheetHeight,
+                        return StatefulBuilder(builder:
-                        color: Theme.of(context).colorScheme.background,
+                            (BuildContext context, StateSetter setState) {
-                        child: Column(
+                          WidgetsBinding.instance
-                          children: [
+                              .addPostFrameCallback((_) async {
-                            Container(
+                            await Future.delayed(
-                              height: 45,
+                                const Duration(milliseconds: 200));
-                              padding:
+                            _scrollController.jumpTo(currentIndex * 56);
-                                  const EdgeInsets.only(left: 14, right: 14),
+                          });
-                              child: Row(
+                          return Container(
-                                mainAxisAlignment:
+                            height: widget.sheetHeight,
-                                    MainAxisAlignment.spaceBetween,
+                            color: Theme.of(context).colorScheme.background,
-                                children: [
+                            child: Column(
-                                  Text(
+                              children: [
-                                    '合集（${episodes.length}）',
+                                Container(
-                                    style:
+                                  height: 45,
-                                        Theme.of(context).textTheme.titleMedium,
+                                  padding: const EdgeInsets.only(
+                                      left: 14, right: 14),
+                                  child: Row(
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      Text(
+                                        '合集（${episodes.length}）',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .titleMedium,
+                                      ),
+                                      IconButton(
+                                        icon: const Icon(Icons.close),
+                                        onPressed: () => Navigator.pop(context),
+                                      ),
+                                    ],
                                   ),
-                                  IconButton(
+                                ),
-                                    icon: const Icon(Icons.close),
+                                Divider(
-                                    onPressed: () => Navigator.pop(context),
+                                  height: 1,
-                                  ),
+                                  color: Theme.of(context)
-                                ],
+                                      .dividerColor
-                              ),
+                                      .withOpacity(0.1),
-                            ),
+                                ),
-                            Divider(
+                                Expanded(
-                              height: 1,
+                                  child: Material(
-                              color: Theme.of(context)
+                                    child: ListView.builder(
-                                  .dividerColor
+                                      controller: _scrollController,
-                                  .withOpacity(0.1),
+                                      itemCount: episodes.length,
-                            ),
+                                      itemBuilder: (context, index) {
-                            Expanded(
+                                        return ListTile(
-                              child: Material(
+                                          onTap: () {
-                                child: ListView.builder(
+                                            changeFucCall(
-                                  itemCount: episodes.length,
+                                                episodes[index], index);
-                                  itemBuilder: (context, index) {
+                                            Get.back();
-                                    return InkWell(
+                                          },
-                                      onTap: () {
+                                          dense: false,
-                                        changeFucCall(episodes[index], index);
+                                          leading: index == currentIndex
-                                        Get.back();
+                                              ? Image.asset(
-                                      },
+                                                  'assets/images/live.gif',
-                                      child: Padding(
+                                                  color: Theme.of(context)
-                                        padding: const EdgeInsets.only(
+                                                      .colorScheme
-                                            top: 10,
+                                                      .primary,
-                                            bottom: 10,
+                                                  height: 12,
-                                            left: 15,
+                                                )
-                                            right: 15),
+                                              : null,
-                                        child: Text(
+                                          title: Text(
-                                          episodes[index].pagePart!,
+                                            episodes[index].pagePart!,
-                                          style: TextStyle(
+                                            style: TextStyle(
+                                              fontSize: 14,
                                               color: index == currentIndex
                                                   ? Theme.of(context)
                                                       .colorScheme
                                                       .primary
                                                   : Theme.of(context)
                                                       .colorScheme
-                                                      .onSurface),
+                                                      .onSurface,
-                                        ),
+                                            ),
-                                      ),
+                                          ),
-                                    );
+                                        );
-                                  },
+                                      },
+                                    ),
+                                  ),
                                 ),
-                              ),
+                              ],
                             ),
-                          ],
+                          );
-                        ),
+                        });
-                      ),
+                      },
                     );
                   },
                   child: Text(