feat: 热搜词跳转直播

.github/workflows/beta_ci.yml

@@ -1,208 +0,0 @@
-name: Pilipala Beta
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-    paths-ignore:
-      - "**.md"
-      - "**.txt"
-      - ".github/**"
-      - ".idea/**"
-      - "!.github/workflows/**"
-
-jobs:
-  update_version:
-    name: Read and update version
-    runs-on: ubuntu-latest
-
-    outputs:
-      # 定义输出变量 version，以便在其他job中引用
-      new_version: ${{ steps.version.outputs.new_version }}
-      last_commit: ${{ steps.get-last-commit.outputs.last_commit }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-          fetch-depth: 0
-
-      - name: 获取first parent commit次数
-        id: get-first-parent-commit-count
-        run: |
-          version=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          recent_release_tag=$(git tag -l | grep $version | egrep -v "[-|+]" || true)
-          if [[ "x$recent_release_tag" == "x" ]]; then
-            echo "当前版本tag不存在，请手动生成tag."
-            exit 1
-          fi
-          git log --oneline --first-parent $recent_release_tag..HEAD
-          first_parent_commit_count=$(git rev-list --first-parent --count $recent_release_tag..HEAD)
-          echo "count=$first_parent_commit_count" >> $GITHUB_OUTPUT
-
-      - name: 获取最后一次提交
-        id: get-last-commit
-        run: |
-          last_commit=$(git log -1 --pretty="%h %s" --first-parent)
-          echo "last_commit=$last_commit" >> $GITHUB_OUTPUT
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 读取版本号
-          VERSION=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-
-          # 获取GitHub Actions的run_number
-          #RUN_NUMBER=${{ github.run_number }}
-
-          # 构建新版本号
-          NEW_VERSION=$VERSION-beta.${{ steps.get-first-parent-commit-count.outputs.count }}
-
-          # 输出新版本号
-          echo "New version: $NEW_VERSION"
-
-          # 设置新版本号为输出变量
-          echo "new_version=$NEW_VERSION" >>$GITHUB_OUTPUT
-
-  android:
-    name: Build CI (Android)
-    needs: update_version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-
-      - name: 构建Java环境
-        uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "17"
-          token: ${{secrets.GIT_TOKEN}}
-
-      - name: 检查缓存
-        uses: actions/cache@v2
-        id: cache-flutter
-        with:
-          path: /root/flutter-sdk
-          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: 3.16.5
-          channel: any
-
-      - name: 下载项目依赖
-        run: flutter pub get
-
-      - name: 解码生成 jks
-        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
-        env:
-          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
-
-      - name: flutter build apk
-        run: flutter build apk --release --split-per-abi
-        env:
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
-
-      - name: 重命名应用
-        run: |
-          for file in build/app/outputs/flutter-apk/app-*.apk; do
-            if [[ $file =~ app-(.?*)release.apk ]]; then
-              new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}v${{ needs.update_version.outputs.new_version }}.apk"
-              mv "$file" "$new_file_name"
-            fi
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          name: Pilipala-Beta
-          path: |
-            build/app/outputs/flutter-apk/Pili-*.apk
-
-  iOS:
-    name: Build CI (iOS)
-    needs: update_version
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2.10.0
-        with:
-          cache: true
-          flutter-version: 3.16.5
-
-      - name: 更新版本号
-        id: version
-        run: |
-          # 更新pubspec.yaml文件中的版本号
-          sed -i "" "s/version: .*+/version: ${{ needs.update_version.outputs.new_version }}+/g" pubspec.yaml
-
-      - name: flutter build ipa
-        run: |
-          flutter build ios --release --no-codesign 
-          ln -sf ./build/ios/iphoneos Payload
-          zip -r9 app.ipa Payload/runner.app
-
-      - name: 重命名应用
-        run: |
-          DATE=${{ steps.date.outputs.date }}
-          for file in app.ipa; do
-            new_file_name="build/Pili-v${{ needs.update_version.outputs.new_version }}.ipa"
-            mv "$file" "$new_file_name"
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          if-no-files-found: error
-          name: Pilipala-Beta
-          path: |
-            build/Pili-*.ipa
-
-  upload:
-    runs-on: ubuntu-latest
-
-    needs:
-      - update_version
-      - android
-      - iOS
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: Pilipala-Beta
-          path: ./Pilipala-Beta
-
-      - name: 发送到Telegram频道
-        uses: xireiki/channel-post@v1.0.7
-        with:
-          bot_token: ${{ secrets.BOT_TOKEN }}
-          chat_id: ${{ secrets.CHAT_ID }}
-          large_file: true
-          api_id: ${{ secrets.TELEGRAM_API_ID }}
-          api_hash: ${{ secrets.TELEGRAM_API_HASH }}
-          method: sendFile
-          path: Pilipala-Beta/*
-          parse_mode: Markdown
-          context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}](${{ github.event.head_commit.url }})"

android/app/src/main/AndroidManifest.xml

@@ -223,10 +223,6 @@
                     android:pathPattern="/mobile/video/.*" />
                 <data android:scheme="https" android:host="www.bilibili.com"
                     android:pathPattern="/mobile/video/.*" />
-                <data android:scheme="https" android:host="b23.tv"
-                    android:pathPattern="/*" />
-                <data android:scheme="https" android:host="space.bilibili.com"
-                    android:pathPattern="/*" />
 
             </intent-filter>
         </activity>

change_log/1.0.20.0303.md

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

change_log/1.0.21.0306.md

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

lib/common/widgets/http_error.dart

@@ -22,27 +22,20 @@ class HttpError extends StatelessWidget {
               "assets/images/error.svg",
               height: 200,
             ),
-            const SizedBox(height: 30),
+            const SizedBox(height: 20),
             Text(
               errMsg ?? '请求异常',
               textAlign: TextAlign.center,
               style: Theme.of(context).textTheme.titleSmall,
             ),
-            const SizedBox(height: 20),
+            const SizedBox(height: 30),
-            FilledButton.tonal(
+            OutlinedButton.icon(
               onPressed: () {
                 fn!();
               },
-              style: ButtonStyle(
+              icon: const Icon(Icons.arrow_forward_outlined, size: 20),
-                backgroundColor: MaterialStateProperty.resolveWith((states) {
+              label: Text(btnText ?? '点击重试'),
-                  return Theme.of(context).colorScheme.primary.withAlpha(20);
+            )
-                }),
-              ),
-              child: Text(
-                btnText ?? '点击重试',
-                style: TextStyle(color: Theme.of(context).colorScheme.primary),
-              ),
-            ),
           ],
         ),
       ),

lib/common/widgets/network_img_layer.dart

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

lib/common/widgets/stat/danmu.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatDanMu extends StatelessWidget {
   final String? theme;
-  final dynamic danmu;
+  final int? danmu;
   final String? size;
 
   const StatDanMu({Key? key, this.theme, this.danmu, this.size})

lib/common/widgets/stat/view.dart

@@ -3,7 +3,7 @@ import 'package:pilipala/utils/utils.dart';
 
 class StatView extends StatelessWidget {
   final String? theme;
-  final dynamic view;
+  final int? view;
   final String? size;
 
   const StatView({Key? key, this.theme, this.view, this.size})

lib/common/widgets/video_card_h.dart

@@ -324,9 +324,8 @@ class VideoContent extends StatelessWidget {
                                           reSrc: 11,
                                         );
                                         SmartDialog.dismiss();
-                                        SmartDialog.showToast(res['code'] == 0
+                                        SmartDialog.showToast(
-                                            ? '成功'
+                                            res['msg'] ?? '成功');
-                                            : res['msg']);
                                       },
                                       child: const Text('确认'),
                                     )

lib/common/widgets/video_card_v.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import '../../models/model_rec_video_item.dart';
-import 'stat/danmu.dart';
-import 'stat/view.dart';
 import '../../http/dynamics.dart';
 import '../../http/search.dart';
 import '../../http/user.dart';
@@ -161,12 +158,12 @@ class VideoCardV extends StatelessWidget {
                           height: maxHeight,
                         ),
                       ),
-                      if (videoItem.duration > 0)
+                      if (videoItem.duration != null)
                         if (crossAxisCount == 1) ...[
                           PBadge(
                             bottom: 10,
                             right: 10,
-                            text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ] else ...[
                           PBadge(
@@ -174,7 +171,7 @@ class VideoCardV extends StatelessWidget {
                             right: 7,
                             size: 'small',
                             type: 'gray',
-                            text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ],
                     ],
@@ -231,7 +228,6 @@ class VideoContent extends StatelessWidget {
               const SizedBox(height: 2),
               VideoStat(
                 videoItem: videoItem,
-                crossAxisCount: crossAxisCount,
               ),
             ],
             if (crossAxisCount == 1) const SizedBox(height: 4),
@@ -295,7 +291,6 @@ class VideoContent extends StatelessWidget {
                   ),
                   VideoStat(
                     videoItem: videoItem,
-                    crossAxisCount: crossAxisCount,
                   ),
                   const Spacer(),
                 ],
@@ -319,41 +314,29 @@ class VideoContent extends StatelessWidget {
 
 class VideoStat extends StatelessWidget {
   final dynamic videoItem;
-  final int crossAxisCount;
 
   const VideoStat({
     Key? key,
     required this.videoItem,
-    required this.crossAxisCount,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return RichText(
-      children: [
+      maxLines: 1,
-        StatView(
+      text: TextSpan(
-          theme: 'gray',
+        style: TextStyle(
-          view: videoItem.stat.view,
+          fontSize: MediaQuery.textScalerOf(context)
+              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
+          color: Theme.of(context).colorScheme.outline,
         ),
-        const SizedBox(width: 8),
+        children: [
-        StatDanMu(
+          if (videoItem.stat.view != '-')
-          theme: 'gray',
+            TextSpan(text: '${videoItem.stat.view}观看'),
-          danmu: videoItem.stat.danmu,
+          if (videoItem.stat.danmu != '-')
-        ),
+            TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
-        if (videoItem is RecVideoItemModel) ...<Widget>[
+        ],
-          crossAxisCount > 1 ? const Spacer() : const SizedBox(width: 8),
+      ),
-          RichText(
-            maxLines: 1,
-            text: TextSpan(
-                style: TextStyle(
-                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-                  color: Theme.of(context).colorScheme.outline,
-                ),
-                text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),
-          ),
-          const SizedBox(width: 4),
-        ]
-      ],
     );
   }
 }

lib/http/api.dart

@@ -214,9 +214,6 @@ class Api {
   // https://api.bilibili.com/x/relation/tags
   static const String followingsClass = '/x/relation/tags';
 
-  // 搜索follow
-  static const followSearch = '/x/relation/followings/search';
-
   // 粉丝
   // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
   // order_type 排序规则 最近访问传空，最常访问传 attention
@@ -233,10 +230,6 @@ class Api {
   static const String liveRoomInfo =
       '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';
 
-  // 直播间详情 H5
-  static const String liveRoomInfoH5 =
-      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getH5InfoByRoom';
-
   // 用户信息 需要Wbi签名
   // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
   static const String memberInfo = '/x/space/wbi/acc/info';
@@ -477,26 +470,4 @@ class Api {
 
   /// 获取未读动态数
   static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
-
-  /// 用户动态主页
-  static const dynamicSpmPrefix = 'https://space.bilibili.com/1/dynamic';
-
-  /// 激活buvid3
-  static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';
-
-  /// 我的订阅
-  static const userSubFolder = '/x/v3/fav/folder/collected/list';
-
-  /// 我的订阅详情
-  static const userSubFolderDetail = '/x/space/fav/season/list';
-
-  /// 表情
-  static const emojiList = '/x/emote/user/panel/web';
-
-  /// 已读标记
-  static const String ackSessionMsg =
-      '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack';
-
-  /// 发送私信
-  static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
 }

lib/http/init.dart

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

lib/http/live.dart

@@ -1,6 +1,5 @@
 import '../models/live/item.dart';
 import '../models/live/room_info.dart';
-import '../models/live/room_info_h5.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -47,22 +46,4 @@ class LiveHttp {
       };
     }
   }
-
-  static Future liveRoomInfoH5({roomId, qn}) async {
-    var res = await Request().get(Api.liveRoomInfoH5, data: {
-      'room_id': roomId,
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': RoomInfoH5Model.fromJson(res.data['data'])
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/member.dart

@@ -79,8 +79,6 @@ class MemberHttp {
     String order = 'pubdate',
     bool orderAvoided = true,
   }) async {
-    String dmImgStr = Utils.base64EncodeRandomString(16, 64);
-    String dmCoverImgStr = Utils.base64EncodeRandomString(32, 128);
     Map params = await WbiSign().makSign({
       'mid': mid,
       'ps': ps,
@@ -90,11 +88,7 @@ class MemberHttp {
       'order': order,
       'platform': 'web',
       'web_location': 1550101,
-      'order_avoided': orderAvoided,
+      'order_avoided': orderAvoided
-      'dm_img_list': '[]',
-      'dm_img_str': dmImgStr.substring(0, dmImgStr.length - 2),
-      'dm_cover_img_str': dmCoverImgStr.substring(0, dmCoverImgStr.length - 2),
-      'dm_img_inter': '{"ds":[],"wh":[0,0,0],"of":[0,0,0]}',
     });
     var res = await Request().get(
       Api.memberArchive,
@@ -107,13 +101,10 @@ class MemberHttp {
         'data': MemberArchiveDataModel.fromJson(res.data['data'])
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -132,13 +123,10 @@ class MemberHttp {
         'data': DynamicsDataModel.fromJson(res.data['data']),
       };
     } else {
-      Map errMap = {
-        -352: '风控校验失败，请检查登录状态',
-      };
       return {
         'status': false,
         'data': [],
-        'msg': errMap[res.data['code']] ?? res.data['message'],
+        'msg': res.data['message'],
       };
     }
   }
@@ -473,41 +461,4 @@ class MemberHttp {
       };
     }
   }
-
-  // 搜索follow
-  static Future getfollowSearch({
-    required int mid,
-    required int ps,
-    required int pn,
-    required String name,
-  }) async {
-    Map<String, dynamic> data = {
-      'vmid': mid,
-      'pn': pn,
-      'ps': ps,
-      'order': 'desc',
-      'order_type': 'attention',
-      'gaia_source': 'main_web',
-      'name': name,
-      'web_location': 333.999,
-    };
-    Map params = await WbiSign().makSign(data);
-    var res = await Request().get(Api.followSearch, data: {
-      ...data,
-      'w_rid': params['w_rid'],
-      'wts': params['wts'],
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': FollowDataModel.fromJson(res.data['data'])
-      };
-    } else {
-      return {
-        'status': false,
-        'data': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/msg.dart

@@ -1,4 +1,3 @@
-import 'dart:math';
 import '../models/msg/account.dart';
 import '../models/msg/session.dart';
 import '../utils/wbi_sign.dart';
@@ -23,18 +22,10 @@ class MsgHttp {
     Map signParams = await WbiSign().makSign(params);
     var res = await Request().get(Api.sessionList, data: signParams);
     if (res.data['code'] == 0) {
-      try {
+      return {
-        return {
+        'status': true,
-          'status': true,
+        'data': SessionDataModel.fromJson(res.data['data']),
-          'data': SessionDataModel.fromJson(res.data['data']),
+      };
-        };
-      } catch (err) {
-        return {
-          'status': false,
-          'date': [],
-          'msg': err.toString(),
-        };
-      }
     } else {
       return {
         'status': false,
@@ -51,16 +42,12 @@ class MsgHttp {
       'mobi_app': 'web',
     });
     if (res.data['code'] == 0) {
-      try {
+      return {
-        return {
+        'status': true,
-          'status': true,
+        'data': res.data['data']
-          'data': res.data['data']
+            .map<AccountListModel>((e) => AccountListModel.fromJson(e))
-              .map<AccountListModel>((e) => AccountListModel.fromJson(e))
+            .toList(),
-              .toList(),
+      };
-        };
-      } catch (err) {
-        print('err🔟: $err');
-      }
     } else {
       return {
         'status': false,
@@ -99,125 +86,4 @@ class MsgHttp {
       };
     }
   }
-
-  // 消息标记已读
-  static Future ackSessionMsg({
-    int? talkerId,
-    int? ackSeqno,
-  }) async {
-    String csrf = await Request.getCsrf();
-    Map params = await WbiSign().makSign({
-      'talker_id': talkerId,
-      'session_type': 1,
-      'ack_seqno': ackSeqno,
-      'build': 0,
-      'mobi_app': 'web',
-      'csrf_token': csrf,
-      'csrf': csrf
-    });
-    var res = await Request().get(Api.ackSessionMsg, data: params);
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {
-        'status': false,
-        'date': [],
-        'msg': "message: ${res.data['message']},"
-            " msg: ${res.data['msg']},"
-            " code: ${res.data['code']}",
-      };
-    }
-  }
-
-  // 发送私信
-  static Future sendMsg({
-    int? senderUid,
-    int? receiverId,
-    int? receiverType,
-    int? msgType,
-    dynamic content,
-  }) async {
-    String csrf = await Request.getCsrf();
-    Map<String, dynamic> params = await WbiSign().makSign({
-      'msg[sender_uid]': senderUid,
-      'msg[receiver_id]': receiverId,
-      'msg[receiver_type]': receiverType ?? 1,
-      'msg[msg_type]': msgType ?? 1,
-      'msg[msg_status]': 0,
-      'msg[dev_id]': getDevId(),
-      'msg[timestamp]': DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      'msg[new_face_version]': 0,
-      'msg[content]': content,
-      'from_firework': 0,
-      'build': 0,
-      'mobi_app': 'web',
-      'csrf_token': csrf,
-      'csrf': csrf,
-    });
-    var res =
-        await Request().post(Api.sendMsg, queryParameters: <String, dynamic>{
-      ...params,
-      'csrf_token': csrf,
-      'csrf': csrf,
-    }, data: {
-      'w_sender_uid': params['msg[sender_uid]'],
-      'w_receiver_id': params['msg[receiver_id]'],
-      'w_dev_id': params['msg[dev_id]'],
-      'w_rid': params['w_rid'],
-      'wts': params['wts'],
-      'csrf_token': csrf,
-      'csrf': csrf,
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': res.data['data'],
-      };
-    } else {
-      return {
-        'status': false,
-        'date': [],
-        'msg': "message: ${res.data['message']},"
-            " msg: ${res.data['msg']},"
-            " code: ${res.data['code']}",
-      };
-    }
-  }
-
-  static String getDevId() {
-    final List<String> b = [
-      '0',
-      '1',
-      '2',
-      '3',
-      '4',
-      '5',
-      '6',
-      '7',
-      '8',
-      '9',
-      'A',
-      'B',
-      'C',
-      'D',
-      'E',
-      'F'
-    ];
-    final List<String> s = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split('');
-    for (int i = 0; i < s.length; i++) {
-      if ('-' == s[i] || '4' == s[i]) {
-        continue;
-      }
-      final int randomInt = Random().nextInt(16);
-      if ('x' == s[i]) {
-        s[i] = b[randomInt];
-      } else {
-        s[i] = b[3 & randomInt | 8];
-      }
-    }
-    return s.join();
-  }
 }

lib/http/reply.dart

@@ -1,5 +1,4 @@
 import '../models/video/reply/data.dart';
-import '../models/video/reply/emote.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -101,23 +100,4 @@ class ReplyHttp {
       };
     }
   }
-
-  static Future getEmoteList({String? business}) async {
-    var res = await Request().get(Api.emojiList, data: {
-      'business': business ?? 'reply',
-      'web_location': '333.1245',
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': EmoteModelData.fromJson(res.data['data']),
-      };
-    } else {
-      return {
-        'status': false,
-        'date': [],
-        'msg': res.data['message'],
-      };
-    }
-  }
 }

lib/http/user.dart

@@ -6,8 +6,6 @@ import '../models/user/fav_folder.dart';
 import '../models/user/history.dart';
 import '../models/user/info.dart';
 import '../models/user/stat.dart';
-import '../models/user/sub_detail.dart';
-import '../models/user/sub_folder.dart';
 import 'api.dart';
 import 'init.dart';
 
@@ -307,46 +305,4 @@ class UserHttp {
       return {'status': false, 'msg': res.data['message']};
     }
   }
-
-  // 我的订阅
-  static Future userSubFolder({
-    required int mid,
-    required int pn,
-    required int ps,
-  }) async {
-    var res = await Request().get(Api.userSubFolder, data: {
-      'up_mid': mid,
-      'ps': ps,
-      'pn': pn,
-      'platform': 'web',
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SubFolderModelData.fromJson(res.data['data'])
-      };
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
-
-  static Future userSubFolderDetail({
-    required int seasonId,
-    required int pn,
-    required int ps,
-  }) async {
-    var res = await Request().get(Api.userSubFolderDetail, data: {
-      'season_id': seasonId,
-      'ps': ps,
-      'pn': pn,
-    });
-    if (res.data['code'] == 0) {
-      return {
-        'status': true,
-        'data': SubDetailModelData.fromJson(res.data['data'])
-      };
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
 }

lib/http/video.dart

@@ -9,7 +9,6 @@ import '../models/user/fav_folder.dart';
 import '../models/video/ai.dart';
 import '../models/video/play/url.dart';
 import '../models/video_detail_res.dart';
-import '../utils/recommend_filter.dart';
 import '../utils/storage.dart';
 import '../utils/wbi_sign.dart';
 import 'api.dart';
@@ -47,13 +46,8 @@ class VideoHttp {
             setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
         for (var i in res.data['data']['item']) {
           //过滤掉live与ad，以及拉黑用户
-          if (i['goto'] == 'av' &&
+          if (i['goto'] == 'av' && !blackMidsList.contains(i['owner']['mid'])) {
-              (i['owner'] != null &&
+            list.add(RecVideoItemModel.fromJson(i));
-                  !blackMidsList.contains(i['owner']['mid']))) {
-            RecVideoItemModel videoItem = RecVideoItemModel.fromJson(i);
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
           }
         }
         return {'status': true, 'data': list};
@@ -65,9 +59,7 @@ class VideoHttp {
     }
   }
 
-  // 添加额外的loginState变量模拟未登录状态
+  static Future rcmdVideoListApp({int? ps, required int freshIdx}) async {
-  static Future rcmdVideoListApp(
-      {bool loginStatus = true, required int freshIdx}) async {
     try {
       var res = await Request().get(
         Api.recommendListApp,
@@ -80,11 +72,9 @@ class VideoHttp {
           'device_name': 'vivo',
           'pull': freshIdx == 0 ? 'true' : 'false',
           'appkey': Constants.appKey,
-          'access_key': loginStatus
+          'access_key': localCache
-              ? (localCache.get(LocalCacheKey.accessKey,
+                  .get(LocalCacheKey.accessKey, defaultValue: {})['value'] ??
-                      defaultValue: {})['value'] ??
+              ''
-                  '')
-              : ''
         },
       );
       if (res.data['code'] == 0) {
@@ -97,15 +87,12 @@ class VideoHttp {
               (!enableRcmdDynamic ? i['card_goto'] != 'picture' : true) &&
               (i['args'] != null &&
                   !blackMidsList.contains(i['args']['up_mid']))) {
-            RecVideoItemAppModel videoItem = RecVideoItemAppModel.fromJson(i);
+            list.add(RecVideoItemAppModel.fromJson(i));
-            if (!RecommendFilter.filter(videoItem)) {
-              list.add(videoItem);
-            }
           }
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': [], 'msg': ''};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err.toString()};
@@ -130,7 +117,7 @@ class VideoHttp {
         }
         return {'status': true, 'data': list};
       } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
+        return {'status': false, 'data': []};
       }
     } catch (err) {
       return {'status': false, 'data': [], 'msg': err};
@@ -216,10 +203,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       List<HotVideoItemModel> list = [];
       for (var i in res.data['data']) {
-        HotVideoItemModel videoItem = HotVideoItemModel.fromJson(i);
+        list.add(HotVideoItemModel.fromJson(i));
-        if (!RecommendFilter.filter(videoItem, relatedVideos: true)) {
-          list.add(videoItem);
-        }
       }
       return {'status': true, 'data': list};
     } else {
@@ -322,7 +306,7 @@ class VideoHttp {
     if (res.data['code'] == 0) {
       return {'status': true, 'data': res.data['data']};
     } else {
-      return {'status': false, 'data': [], 'msg': res.data['message']};
+      return {'status': false, 'data': []};
     }
   }
 

lib/main.dart

@@ -21,7 +21,6 @@ import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
-import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:catcher_2/catcher_2.dart';
 import './services/loggeer.dart';
 
@@ -35,7 +34,6 @@ void main() async {
     await setupServiceLocator();
     Request();
     await Request.setCookie();
-    RecommendFilter();
 
     // 异常捕获 logo记录
     final Catcher2Options debugConfig = Catcher2Options(
@@ -70,6 +68,7 @@ void main() async {
       statusBarColor: Colors.transparent,
     ));
     Data.init();
+    GStrorage.lazyInit();
     PiliSchame.init();
   });
 }

lib/models/common/gesture_mode.dart

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

lib/models/common/index.dart

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

lib/models/common/nav_bar_config.dart

@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-
-List defaultNavigationBars = [
-  {
-    'id': 0,
-    'icon': const Icon(
-      Icons.home_outlined,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.home,
-      size: 21,
-    ),
-    'label': "首页",
-    'count': 0,
-  },
-  {
-    'id': 1,
-    'icon': const Icon(
-      Icons.motion_photos_on_outlined,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.motion_photos_on,
-      size: 21,
-    ),
-    'label': "动态",
-    'count': 0,
-  },
-  {
-    'id': 2,
-    'icon': const Icon(
-      Icons.video_collection_outlined,
-      size: 20,
-    ),
-    'selectIcon': const Icon(
-      Icons.video_collection,
-      size: 21,
-    ),
-    'label': "媒体库",
-    'count': 0,
-  }
-];

lib/models/common/rcmd_type.dart

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

lib/models/common/reply_sort_type.dart

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

lib/models/dynamics/up.dart

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

lib/models/home/rcmd/result.dart

@@ -1,5 +1,3 @@
-import 'package:pilipala/utils/id_utils.dart';
-
 class RecVideoItemAppModel {
   RecVideoItemAppModel({
     this.id,
@@ -30,7 +28,7 @@ class RecVideoItemAppModel {
   int? cid;
   String? pic;
   RcmdStat? stat;
-  int? duration;
+  String? duration;
   String? title;
   int? isFollowed;
   RcmdOwner? owner;
@@ -52,32 +50,17 @@ class RecVideoItemAppModel {
         ? json['player_args']['aid']
         : int.parse(json['param'] ?? '-1');
     aid = json['player_args'] != null ? json['player_args']['aid'] : -1;
-    bvid = json['player_args'] != null
+    bvid = null;
-        ? IdUtils.av2bv(json['player_args']['aid'])
-        : '';
     cid = json['player_args'] != null ? json['player_args']['cid'] : -1;
     pic = json['cover'];
     stat = RcmdStat.fromJson(json);
-    // 改用player_args中的duration作为原始数据（秒数）
+    duration = json['cover_right_text'];
-    duration =
-        json['player_args'] != null ? json['player_args']['duration'] : -1;
-    //duration = json['cover_right_text'];
     title = json['title'];
+    isFollowed = 0;
     owner = RcmdOwner.fromJson(json);
     rcmdReason = json['rcmd_reason_style'] != null
         ? RcmdReason.fromJson(json['rcmd_reason_style'])
         : null;
-    // 由于app端api并不会直接返回与owner的关注状态
-    // 所以借用推荐原因是否为“已关注”、“新关注”等判别关注状态，从而与web端接口等效
-    isFollowed = rcmdReason != null &&
-            rcmdReason!.content != null &&
-            rcmdReason!.content!.contains('关注')
-        ? 1
-        : 0;
-    // 如果是，就无需再显示推荐原因，交由view统一处理即可
-    if (isFollowed == 1) {
-      rcmdReason = null;
-    }
     goto = json['goto'];
     param = int.parse(json['param']);
     uri = json['uri'];

lib/models/live/room_info_h5.dart

@@ -1,130 +0,0 @@
-class RoomInfoH5Model {
-  RoomInfoH5Model({
-    this.roomInfo,
-    this.anchorInfo,
-    this.isRoomFeed,
-    this.watchedShow,
-    this.likeInfoV3,
-    this.blockInfo,
-  });
-
-  RoomInfo? roomInfo;
-  AnchorInfo? anchorInfo;
-  int? isRoomFeed;
-  Map? watchedShow;
-  LikeInfoV3? likeInfoV3;
-  Map? blockInfo;
-
-  RoomInfoH5Model.fromJson(Map<String, dynamic> json) {
-    roomInfo = RoomInfo.fromJson(json['room_info']);
-    anchorInfo = AnchorInfo.fromJson(json['anchor_info']);
-    isRoomFeed = json['is_room_feed'];
-    watchedShow = json['watched_show'];
-    likeInfoV3 = LikeInfoV3.fromJson(json['like_info_v3']);
-    blockInfo = json['block_info'];
-  }
-}
-
-class RoomInfo {
-  RoomInfo({
-    this.uid,
-    this.roomId,
-    this.title,
-    this.cover,
-    this.description,
-    this.liveStatus,
-    this.liveStartTime,
-    this.areaId,
-    this.areaName,
-    this.parentAreaId,
-    this.parentAreaName,
-    this.online,
-    this.background,
-    this.appBackground,
-    this.liveId,
-  });
-
-  int? uid;
-  int? roomId;
-  String? title;
-  String? cover;
-  String? description;
-  int? liveStatus;
-  int? liveStartTime;
-  int? areaId;
-  String? areaName;
-  int? parentAreaId;
-  String? parentAreaName;
-  int? online;
-  String? background;
-  String? appBackground;
-  String? liveId;
-
-  RoomInfo.fromJson(Map<String, dynamic> json) {
-    uid = json['uid'];
-    roomId = json['room_id'];
-    title = json['title'];
-    cover = json['cover'];
-    description = json['description'];
-    liveStatus = json['liveS_satus'];
-    liveStartTime = json['live_start_time'];
-    areaId = json['area_id'];
-    areaName = json['area_name'];
-    parentAreaId = json['parent_area_id'];
-    parentAreaName = json['parent_area_name'];
-    online = json['online'];
-    background = json['background'];
-    appBackground = json['app_background'];
-    liveId = json['live_id'];
-  }
-}
-
-class AnchorInfo {
-  AnchorInfo({
-    this.baseInfo,
-    this.relationInfo,
-  });
-
-  BaseInfo? baseInfo;
-  RelationInfo? relationInfo;
-
-  AnchorInfo.fromJson(Map<String, dynamic> json) {
-    baseInfo = BaseInfo.fromJson(json['base_info']);
-    relationInfo = RelationInfo.fromJson(json['relation_info']);
-  }
-}
-
-class BaseInfo {
-  BaseInfo({
-    this.uname,
-    this.face,
-  });
-
-  String? uname;
-  String? face;
-
-  BaseInfo.fromJson(Map<String, dynamic> json) {
-    uname = json['uname'];
-    face = json['face'];
-  }
-}
-
-class RelationInfo {
-  RelationInfo({this.attention});
-
-  int? attention;
-
-  RelationInfo.fromJson(Map<String, dynamic> json) {
-    attention = json['attention'];
-  }
-}
-
-class LikeInfoV3 {
-  LikeInfoV3({this.totalLikes});
-
-  int? totalLikes;
-
-  LikeInfoV3.fromJson(Map<String, dynamic> json) {
-    totalLikes = json['total_likes'];
-  }
-}

lib/models/member/archive.dart

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

lib/models/model_rec_video_item.dart

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

lib/models/model_rec_video_item.g.dart

@@ -24,7 +24,7 @@ class RecVideoItemModelAdapter extends TypeAdapter<RecVideoItemModel> {
       uri: fields[4] as String?,
       pic: fields[5] as String?,
       title: fields[6] as String?,
-      duration: fields[7] as int?,
+      duration: fields[7] as String?,
       pubdate: fields[8] as int?,
       owner: fields[9] as Owner?,
       stat: fields[10] as Stat?,
@@ -87,7 +87,7 @@ class StatAdapter extends TypeAdapter<Stat> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return Stat(
-      view: fields[0] as int?,
+      view: fields[0] as String?,
       like: fields[1] as int?,
       danmu: fields[2] as int?,
     );

lib/models/msg/session.dart

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

lib/models/search/hot.dart

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

lib/models/search/hot.g.dart

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

lib/models/user/fav_folder.dart

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

lib/models/user/sub_detail.dart

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

lib/models/user/sub_folder.dart

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

lib/models/video/play/url.dart

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

lib/models/video/reply/content.dart

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

lib/models/video/reply/emote.dart

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

lib/pages/about/index.dart

@@ -7,7 +7,6 @@ import 'package:pilipala/http/index.dart';
 import 'package:pilipala/models/github/latest.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:url_launcher/url_launcher.dart';
-import '../../utils/cache_manage.dart';
 
 class AboutPage extends StatefulWidget {
   const AboutPage({super.key});
@@ -18,19 +17,6 @@ class AboutPage extends StatefulWidget {
 
 class _AboutPageState extends State<AboutPage> {
   final AboutController _aboutController = Get.put(AboutController());
-  String cacheSize = '';
-
-  @override
-  void initState() {
-    super.initState();
-    // 读取缓存占用
-    getCacheSize();
-  }
-
-  Future<void> getCacheSize() async {
-    final res = await CacheManage().loadApplicationCache();
-    setState(() => cacheSize = res);
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -53,54 +39,29 @@ class _AboutPageState extends State<AboutPage> {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             const SizedBox(height: 6),
+            Text(
+              '使用Flutter开发的哔哩哔哩第三方客户端',
+              style: TextStyle(color: Theme.of(context).colorScheme.outline),
+            ),
+            const SizedBox(height: 20),
             Obx(
-              () => Badge(
+              () => ListTile(
-                isLabelVisible: _aboutController.isLoading.value
+                title: const Text('当前版本'),
-                    ? false
+                trailing: Text(_aboutController.currentVersion.value,
-                    : _aboutController.isUpdate.value,
+                    style: subTitleStyle),
-                label: const Text('New'),
+              ),
-                child: Padding(
+            ),
-                  padding: const EdgeInsets.fromLTRB(0, 0, 0, 30),
+            Obx(
-                  child: FilledButton.tonal(
+              () => ListTile(
-                    onPressed: () {
+                onTap: () => _aboutController.onUpdate(),
-                      showModalBottomSheet(
+                title: const Text('最新版本'),
-                        context: context,
+                trailing: Text(
-                        builder: (context) {
+                  _aboutController.isLoading.value
-                          return Column(
+                      ? '正在获取'
-                            mainAxisSize: MainAxisSize.min,
+                      : _aboutController.isUpdate.value
-                            children: [
+                          ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
-                              ListTile(
+                          : '当前已是最新版',
-                                onTap: () => _aboutController.githubRelease(),
+                  style: subTitleStyle,
-                                title: const Text('Github下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.panDownload(),
-                                title: const Text('网盘下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.webSiteUrl(),
-                                title: const Text('官网下载'),
-                              ),
-                              ListTile(
-                                onTap: () => _aboutController.qimiao(),
-                                title: const Text('奇妙应用'),
-                              ),
-                              SizedBox(
-                                  height:
-                                      MediaQuery.of(context).padding.bottom +
-                                          20)
-                            ],
-                          );
-                        },
-                      );
-                    },
-                    child: Text(
-                      'V${_aboutController.currentVersion.value}',
-                      style: subTitleStyle.copyWith(
-                        color: Theme.of(context).primaryColor,
-                      ),
-                    ),
-                  ),
                 ),
               ),
             ),
@@ -112,9 +73,14 @@ class _AboutPageState extends State<AboutPage> {
             //     size: 16,
             //   ),
             // ),
+            Divider(
+              thickness: 1,
+              height: 30,
+              color: Theme.of(context).colorScheme.outlineVariant,
+            ),
             ListTile(
               onTap: () => _aboutController.githubUrl(),
-              title: const Text('开源地址'),
+              title: const Text('Github'),
               trailing: Text(
                 'github.com/guozhigq/pilipala',
                 style: subTitleStyle,
@@ -149,43 +115,19 @@ class _AboutPageState extends State<AboutPage> {
               ),
             ),
             ListTile(
-              onTap: () {
+              onTap: () => _aboutController.qqChanel(),
-                showModalBottomSheet(
+              title: const Text('QQ群'),
-                  context: context,
-                  builder: (context) {
-                    return Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        ListTile(
-                          onTap: () => _aboutController.qqChanel(),
-                          title: const Text('QQ群'),
-                          trailing: Text(
-                            '616150809',
-                            style: subTitleStyle,
-                          ),
-                        ),
-                        ListTile(
-                          onTap: () => _aboutController.tgChanel(),
-                          title: const Text('TG频道'),
-                          trailing: Text(
-                            'https://t.me/+lm_oOVmF0RJiODk1',
-                            style: subTitleStyle,
-                          ),
-                        ),
-                        SizedBox(
-                            height: MediaQuery.of(context).padding.bottom + 20)
-                      ],
-                    );
-                  },
-                );
-              },
-              title: const Text('交流社区'),
               trailing: Icon(
                 Icons.arrow_forward_ios,
                 size: 16,
                 color: outline,
               ),
             ),
+            ListTile(
+              onTap: () => _aboutController.tgChanel(),
+              title: const Text('TG频道'),
+              trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            ),
             ListTile(
               onTap: () => _aboutController.aPay(),
               title: const Text('赞助'),
@@ -196,18 +138,6 @@ class _AboutPageState extends State<AboutPage> {
               title: const Text('错误日志'),
               trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
             ),
-            ListTile(
-              onTap: () async {
-                var cleanStatus = await CacheManage().clearCacheAll();
-                if (cleanStatus) {
-                  getCacheSize();
-                  SmartDialog.showToast('清除成功');
-                }
-              },
-              title: const Text('清除缓存'),
-              subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle),
-            ),
-            SizedBox(height: MediaQuery.of(context).padding.bottom + 20)
           ],
         ),
       ),
@@ -275,26 +205,11 @@ class AboutController extends GetxController {
     );
   }
 
-  githubRelease() {
-    launchUrl(
-      Uri.parse('https://github.com/guozhigq/pilipala/release'),
-      mode: LaunchMode.externalApplication,
-    );
-  }
-
   // 从网盘下载
   panDownload() {
-    Clipboard.setData(
+    launchUrl(
-      const ClipboardData(text: 'pili'),
+      Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
-    );
+      mode: LaunchMode.externalApplication,
-    SmartDialog.showToast(
-      '已复制提取码：pili',
-      displayTime: const Duration(milliseconds: 500),
-    ).then(
-      (value) => launchUrl(
-        Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
-        mode: LaunchMode.externalApplication,
-      ),
     );
   }
 
@@ -310,7 +225,7 @@ class AboutController extends GetxController {
   // qq频道
   qqChanel() {
     Clipboard.setData(
-      const ClipboardData(text: '616150809'),
+      const ClipboardData(text: '489981949'),
     );
     SmartDialog.showToast('已复制QQ群号');
   }
@@ -351,13 +266,6 @@ class AboutController extends GetxController {
     );
   }
 
-  qimiao() {
-    launchUrl(
-      Uri.parse('https://www.magicalapk.com/home'),
-      mode: LaunchMode.externalApplication,
-    );
-  }
-
   // 日志
   logs() {
     Get.toNamed('/logs');

lib/pages/bangumi/controller.dart

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

lib/pages/bangumi/introduction/controller.dart

@@ -218,12 +218,14 @@ class BangumiIntroController extends GetxController {
         addIds: addMediaIdsNew.join(','),
         delIds: delMediaIdsNew.join(','));
     if (result['status']) {
-      addMediaIdsNew = [];
+      if (result['data']['prompt']) {
-      delMediaIdsNew = [];
+        addMediaIdsNew = [];
-      // 重新获取收藏状态
+        delMediaIdsNew = [];
-      queryHasFavVideo();
+        Get.back();
-      SmartDialog.showToast('✅ 操作成功');
+        // 重新获取收藏状态
-      Get.back();
+        queryHasFavVideo();
+        SmartDialog.showToast('✅ 操作成功');
+      }
     }
   }
 

lib/pages/bangumi/view.dart

@@ -9,6 +9,7 @@ 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';
 
 import 'controller.dart';
 import 'widgets/bangumu_card_v.dart';
@@ -198,10 +199,7 @@ class _BangumiPageState extends State<BangumiPage>
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () {
+                      fn: () => {},
-                        _futureBuilderFuture =
-                            _bangumidController.queryBangumiListFeed();
-                      },
                     );
                   }
                 } else {
@@ -210,6 +208,7 @@ class _BangumiPageState extends State<BangumiPage>
               },
             ),
           ),
+          const LoadingMore()
         ],
       ),
     );

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -65,45 +65,6 @@ class _BangumiPanelState extends State<BangumiPanel> {
     super.dispose();
   }
 
-  Widget buildPageListItem(
-    EpisodeItem page,
-    int index,
-    bool isCurrentIndex,
-  ) {
-    Color primary = Theme.of(context).colorScheme.primary;
-    return ListTile(
-      onTap: () {
-        Get.back();
-        setState(() {
-          changeFucCall(page, index);
-        });
-      },
-      dense: false,
-      leading: isCurrentIndex
-          ? Image.asset(
-              'assets/images/live.gif',
-              color: primary,
-              height: 12,
-            )
-          : null,
-      title: Text(
-        '第${index + 1}话  ${page.longTitle!}',
-        style: TextStyle(
-          fontSize: 14,
-          color: isCurrentIndex
-              ? primary
-              : Theme.of(context).colorScheme.onSurface,
-        ),
-      ),
-      trailing: page.badge != null
-          ? Image.asset(
-              'assets/images/big-vip.png',
-              height: 20,
-            )
-          : const SizedBox(),
-    );
-  }
-
   void showBangumiPanel() {
     showBottomSheet(
       context: context,
@@ -145,21 +106,37 @@ class _BangumiPanelState extends State<BangumiPanel> {
                     child: Material(
                       child: ScrollablePositionedList.builder(
                         itemCount: widget.pages.length,
-                        itemBuilder: (BuildContext context, int index) {
+                        itemBuilder: (BuildContext context, int index) =>
-                          bool isLastItem = index == widget.pages.length - 1;
+                            ListTile(
-                          bool isCurrentIndex = currentIndex == index;
+                          onTap: () {
-                          return isLastItem
+                            setState(() {
-                              ? SizedBox(
+                              changeFucCall(widget.pages[index], index);
-                                  height:
+                            });
-                                      MediaQuery.of(context).padding.bottom +
+                          },
-                                          20,
+                          dense: false,
+                          leading: index == currentIndex
+                              ? Image.asset(
+                                  'assets/images/live.gif',
+                                  color: Theme.of(context).colorScheme.primary,
+                                  height: 12,
                                 )
-                              : buildPageListItem(
+                              : null,
-                                  widget.pages[index],
+                          title: Text(
-                                  index,
+                            '第${index + 1}话  ${widget.pages[index].longTitle!}',
-                                  isCurrentIndex,
+                            style: TextStyle(
-                                );
+                              fontSize: 14,
-                        },
+                              color: index == currentIndex
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).colorScheme.onSurface,
+                            ),
+                          ),
+                          trailing: widget.pages[index].badge != null
+                              ? Image.asset(
+                                  'assets/images/big-vip.png',
+                                  height: 20,
+                                )
+                              : const SizedBox(),
+                        ),
                         itemScrollController: itemScrollController,
                       ),
                     ),
@@ -174,7 +151,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
   }
 
   void changeFucCall(item, i) async {
-    if (item.badge != null && item.badge == '会员' && vipStatus != 1) {
+    if (item.badge != null && vipStatus != 1) {
       SmartDialog.showToast('需要大会员');
       return;
     }
@@ -278,24 +255,11 @@ class _BangumiPanelState extends State<BangumiPanel> {
                               ),
                               const SizedBox(width: 2),
                               if (widget.pages[i].badge != null) ...[
-                                if (widget.pages[i].badge == '会员') ...[
+                                Image.asset(
-                                  Image.asset(
+                                  'assets/images/big-vip.png',
-                                    'assets/images/big-vip.png',
+                                  height: 16,
-                                    height: 16,
+                                ),
-                                  ),
+                              ],
-                                ],
-                                if (widget.pages[i].badge != '会员') ...[
-                                  const Spacer(),
-                                  Text(
-                                    widget.pages[i].badge!,
-                                    style: TextStyle(
-                                      fontSize: 11,
-                                      color:
-                                          Theme.of(context).colorScheme.primary,
-                                    ),
-                                  ),
-                                ],
-                              ]
                             ],
                           ),
                           const SizedBox(height: 3),

lib/pages/blacklist/index.dart

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

lib/pages/dynamics/controller.dart

@@ -20,7 +20,7 @@ import 'package:pilipala/utils/utils.dart';
 class DynamicsController extends GetxController {
   int page = 1;
   String? offset = '';
-  RxList<DynamicItemModel> dynamicsList = <DynamicItemModel>[].obs;
+  RxList<DynamicItemModel> dynamicsList = [DynamicItemModel()].obs;
   Rx<DynamicsType> dynamicsType = DynamicsType.values[0].obs;
   RxString dynamicsTypeLabel = '全部'.obs;
   final ScrollController scrollController = ScrollController();
@@ -105,7 +105,7 @@ class DynamicsController extends GetxController {
 
   onSelectType(value) async {
     dynamicsType.value = filterTypeList[value]['value'];
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     initialValue.value = value;
     await queryFollowDynamic();
@@ -249,8 +249,8 @@ class DynamicsController extends GetxController {
       return {'status': false, 'msg': '账号未登录'};
     }
     if (type == 'init') {
-      upData.value.upList = <UpItem>[];
+      upData.value.upList = [];
-      upData.value.liveList = <LiveUserItem>[];
+      upData.value.liveUsers = LiveUsers();
     }
     var res = await DynamicsHttp.followUp();
     if (res['status']) {
@@ -258,23 +258,20 @@ class DynamicsController extends GetxController {
       if (upData.value.upList!.isEmpty) {
         mid.value = -1;
       }
-      upData.value.upList!.insertAll(0, [
-        UpItem(face: '', uname: '全部动态', mid: -1),
-        UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid),
-      ]);
     }
     return res;
   }
 
   onSelectUp(mid) async {
     dynamicsType.value = DynamicsType.values[0];
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     page = 1;
     queryFollowDynamic();
   }
 
   onRefresh() async {
     page = 1;
+    print('onRefresh');
     await queryFollowUp();
     await queryFollowDynamic();
   }
@@ -296,7 +293,7 @@ class DynamicsController extends GetxController {
     dynamicsType.value = DynamicsType.values[0];
     initialValue.value = 0;
     SmartDialog.showToast('还原默认加载');
-    dynamicsList.value = <DynamicItemModel>[];
+    dynamicsList.value = [DynamicItemModel()];
     queryFollowDynamic();
   }
 }

lib/pages/dynamics/detail/controller.dart

@@ -17,7 +17,7 @@ class DynamicDetailController extends GetxController {
   int currentPage = 0;
   bool isLoadingMore = false;
   RxString noMore = ''.obs;
-  RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
+  RxList<ReplyItemModel> replyList = [ReplyItemModel()].obs;
   RxInt acount = 0.obs;
   final ScrollController scrollController = ScrollController();
 
@@ -37,10 +37,6 @@ class DynamicDetailController extends GetxController {
     }
     int deaultReplySortIndex =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0);
-    if (deaultReplySortIndex == 2) {
-      setting.put(SettingBoxKey.replySortType, 0);
-      deaultReplySortIndex = 0;
-    }
     _sortType = ReplySortType.values[deaultReplySortIndex];
     sortTypeTitle.value = _sortType.titles;
     sortTypeLabel.value = _sortType.labels;
@@ -96,6 +92,9 @@ class DynamicDetailController extends GetxController {
         _sortType = ReplySortType.like;
         break;
       case ReplySortType.like:
+        _sortType = ReplySortType.reply;
+        break;
+      case ReplySortType.reply:
         _sortType = ReplySortType.time;
         break;
       default:

lib/pages/dynamics/view.dart

@@ -192,6 +192,22 @@ class _DynamicsPageState extends State<DynamicsPage>
                   )
                 ],
               ),
+              // Obx(
+              //   () => Visibility(
+              //     visible: _dynamicsController.userLogin.value,
+              //     child: Positioned(
+              //       right: 4,
+              //       top: 0,
+              //       bottom: 0,
+              //       child: IconButton(
+              //         padding: EdgeInsets.zero,
+              //         onPressed: () =>
+              //             {feedBack(), _dynamicsController.resetSearch()},
+              //         icon: const Icon(Icons.history, size: 21),
+              //       ),
+              //     ),
+              //   ),
+              // ),
             ],
           ),
         ),
@@ -213,8 +229,7 @@ class _DynamicsPageState extends State<DynamicsPage>
                     return Obx(() => UpPanel(_dynamicsController.upData.value));
                   } else {
                     return const SliverToBoxAdapter(
-                      child: SizedBox(height: 80),
+                        child: SizedBox(height: 80));
-                    );
                   }
                 } else {
                   return const SliverToBoxAdapter(
@@ -225,6 +240,15 @@ class _DynamicsPageState extends State<DynamicsPage>
                 }
               },
             ),
+            SliverToBoxAdapter(
+              child: Container(
+                height: 6,
+                color: Theme.of(context)
+                    .colorScheme
+                    .onInverseSurface
+                    .withOpacity(0.5),
+              ),
+            ),
             FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {

lib/pages/dynamics/widgets/article_panel.dart

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

lib/pages/dynamics/widgets/content_panel.dart

@@ -45,9 +45,7 @@ class _ContentState extends State<Content> {
     if (len == 1) {
       OpusPicsModel pictureItem = pics.first;
       picList.add(pictureItem.url!);
-
+      spanChilds.add(const TextSpan(text: '\n'));
-      /// 图片上方的空白间隔
-      // spanChilds.add(const TextSpan(text: '\n'));
       spanChilds.add(
         WidgetSpan(
           child: LayoutBuilder(

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -19,17 +19,6 @@ InlineSpan richNode(item, context) {
       // 动态页面 richTextNodes 层级可能与主页动态层级不同
       richTextNodes =
           item.modules.moduleDynamic.major.opus.summary.richTextNodes;
-      if (item.modules.moduleDynamic.major.opus.title != null) {
-        spanChilds.add(
-          TextSpan(
-            text: item.modules.moduleDynamic.major.opus.title + '\n',
-            style: Theme.of(context)
-                .textTheme
-                .titleMedium!
-                .copyWith(fontWeight: FontWeight.bold),
-          ),
-        );
-      }
     }
     if (richTextNodes == null || richTextNodes.isEmpty) {
       return spacer;

lib/pages/dynamics/widgets/up_panel.dart

@@ -1,14 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
 import 'package:pilipala/pages/dynamics/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 
 class UpPanel extends StatefulWidget {
-  final FollowUpModel upData;
+  final FollowUpModel? upData;
   const UpPanel(this.upData, {Key? key}) : super(key: key);
 
   @override
@@ -22,22 +24,39 @@ class _UpPanelState extends State<UpPanel> {
   List<UpItem> upList = [];
   List<LiveUserItem> liveList = [];
   static const itemPadding = EdgeInsets.symmetric(horizontal: 5, vertical: 0);
-  late MyInfo userInfo;
+  Box userInfoCache = GStrorage.userInfo;
+  var userInfo;
 
-  void listFormat() {
+  @override
-    userInfo = widget.upData.myInfo!;
+  void initState() {
-    upList = widget.upData.upList!;
+    super.initState();
-    liveList = widget.upData.liveList!;
+    upList = widget.upData!.upList!;
+    if (widget.upData!.liveUsers != null) {
+      liveList = widget.upData!.liveUsers!.items!;
+    }
+    upList.insert(
+      0,
+      UpItem(
+          face: 'https://files.catbox.moe/8uc48f.png', uname: '全部动态', mid: -1),
+    );
+    userInfo = userInfoCache.get('userInfoCache');
+    upList.insert(
+      1,
+      UpItem(
+        face: userInfo.face,
+        uname: '我',
+        mid: userInfo.mid,
+      ),
+    );
   }
 
   @override
   Widget build(BuildContext context) {
-    listFormat();
     return SliverPersistentHeader(
       floating: true,
       pinned: false,
       delegate: _SliverHeaderDelegate(
-          height: liveList.isNotEmpty || upList.isNotEmpty ? 126 : 0,
+          height: 124,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -72,7 +91,7 @@ class _UpPanelState extends State<UpPanel> {
                 color: Theme.of(context).colorScheme.background,
                 child: Row(
                   children: [
-                    Flexible(
+                    Expanded(
                       child: ListView(
                         scrollDirection: Axis.horizontal,
                         controller: scrollController,
@@ -102,13 +121,6 @@ class _UpPanelState extends State<UpPanel> {
                   ],
                 ),
               ),
-              Container(
-                height: 6,
-                color: Theme.of(context)
-                    .colorScheme
-                    .onInverseSurface
-                    .withOpacity(0.5),
-              ),
             ],
           )),
     );
@@ -159,9 +171,6 @@ class _UpPanelState extends State<UpPanel> {
       },
       onLongPress: () {
         feedBack();
-        if (data.mid == -1) {
-          return;
-        }
         String heroTag = Utils.makeHeroTag(data.mid);
         Get.toNamed('/member?mid=${data.mid}',
             arguments: {'face': data.face, 'heroTag': heroTag});
@@ -189,19 +198,12 @@ class _UpPanelState extends State<UpPanel> {
                 backgroundColor: data.type == 'live'
                     ? Theme.of(context).colorScheme.secondaryContainer
                     : Theme.of(context).colorScheme.primary,
-                child: data.face != ''
+                child: NetworkImgLayer(
-                    ? NetworkImgLayer(
+                  width: 49,
-                        width: 50,
+                  height: 49,
-                        height: 50,
+                  src: data.face,
-                        src: data.face,
+                  type: 'avatar',
-                        type: 'avatar',
+                ),
-                      )
-                    : const CircleAvatar(
-                        radius: 25,
-                        backgroundImage: AssetImage(
-                          'assets/images/noface.jpeg',
-                        ),
-                      ),
               ),
               Padding(
                 padding: const EdgeInsets.only(top: 4),
@@ -269,11 +271,13 @@ class UpPanelSkeleton extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Container(
-                width: 50,
+                width: 49,
-                height: 50,
+                height: 49,
                 decoration: BoxDecoration(
                   color: Theme.of(context).colorScheme.onInverseSurface,
-                  borderRadius: BorderRadius.circular(50),
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(24),
+                  ),
                 ),
               ),
               Container(

lib/pages/emote/controller.dart

@@ -1,20 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-import '../../http/reply.dart';
-import '../../models/video/reply/emote.dart';
-
-class EmotePanelController extends GetxController
-    with GetTickerProviderStateMixin {
-  late List<PackageItem> emotePackage;
-  late TabController tabController;
-
-  Future getEmote() async {
-    var res = await ReplyHttp.getEmoteList(business: 'reply');
-    if (res['status']) {
-      emotePackage = res['data'].packages;
-      tabController = TabController(length: emotePackage.length, vsync: this);
-    }
-    return res;
-  }
-}

lib/pages/emote/index.dart

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

lib/pages/emote/view.dart

@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import '../../models/video/reply/emote.dart';
-import 'controller.dart';
-
-class EmotePanel extends StatefulWidget {
-  final Function onChoose;
-  const EmotePanel({super.key, required this.onChoose});
-
-  @override
-  State<EmotePanel> createState() => _EmotePanelState();
-}
-
-class _EmotePanelState extends State<EmotePanel>
-    with AutomaticKeepAliveClientMixin {
-  final EmotePanelController _emotePanelController =
-      Get.put(EmotePanelController());
-  late Future _futureBuilderFuture;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    _futureBuilderFuture = _emotePanelController.getEmote();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    return FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
-            Map data = snapshot.data as Map;
-            if (data['status']) {
-              List<PackageItem> emotePackage =
-                  _emotePanelController.emotePackage;
-
-              return Column(
-                children: [
-                  Expanded(
-                      child: TabBarView(
-                    controller: _emotePanelController.tabController,
-                    children: emotePackage.map(
-                      (e) {
-                        int size = e.emote!.first.meta!.size!;
-                        int type = e.type!;
-                        return Padding(
-                          padding: const EdgeInsets.fromLTRB(12, 6, 12, 0),
-                          child: GridView.builder(
-                            gridDelegate:
-                                SliverGridDelegateWithMaxCrossAxisExtent(
-                              maxCrossAxisExtent: size == 1 ? 40 : 60,
-                              crossAxisSpacing: 8,
-                              mainAxisSpacing: 8,
-                            ),
-                            itemCount: e.emote!.length,
-                            itemBuilder: (context, index) {
-                              return Material(
-                                color: Colors.transparent,
-                                clipBehavior: Clip.hardEdge,
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(4),
-                                ),
-                                child: InkWell(
-                                  onTap: () {
-                                    widget.onChoose(e, e.emote![index]);
-                                  },
-                                  child: Padding(
-                                    padding: const EdgeInsets.all(3),
-                                    child: type == 4
-                                        ? Text(
-                                            e.emote![index].text!,
-                                            overflow: TextOverflow.clip,
-                                            maxLines: 1,
-                                          )
-                                        : Image.network(
-                                            e.emote![index].url!,
-                                            width: size * 38,
-                                            height: size * 38,
-                                          ),
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
-                        );
-                      },
-                    ).toList(),
-                  )),
-                  Divider(
-                    height: 1,
-                    color: Theme.of(context).dividerColor.withOpacity(0.1),
-                  ),
-                  TabBar(
-                    controller: _emotePanelController.tabController,
-                    dividerColor: Colors.transparent,
-                    isScrollable: true,
-                    tabs: _emotePanelController.emotePackage
-                        .map((e) => Tab(text: e.text))
-                        .toList(),
-                  ),
-                  SizedBox(height: MediaQuery.of(context).padding.bottom + 20),
-                ],
-              );
-            } else {
-              return Center(child: Text(data['msg']));
-            }
-          } else {
-            return const Center(child: Text('加载中...'));
-          }
-        });
-  }
-}

lib/pages/fan/controller.dart

@@ -10,7 +10,7 @@ class FansController extends GetxController {
   int pn = 1;
   int ps = 20;
   int total = 0;
-  RxList<FansItemModel> fansList = <FansItemModel>[].obs;
+  RxList<FansItemModel> fansList = [FansItemModel()].obs;
   late int mid;
   late String name;
   var userInfo;

lib/pages/fav/controller.dart

@@ -24,7 +24,7 @@ class FavController extends GetxController {
     if (!hasMore.value) {
       return;
     }
-    var res = await UserHttp.userfavFolder(
+    var res = await await UserHttp.userfavFolder(
       pn: currentPage,
       ps: pageSize,
       mid: userInfo!.mid!,

lib/pages/fav_detail/controller.dart

@@ -34,7 +34,7 @@ class FavDetailController extends GetxController {
       return;
     }
     isLoadingMore = true;
-    var res = await UserHttp.userFavFolderDetail(
+    var res = await await UserHttp.userFavFolderDetail(
       pn: currentPage,
       ps: 20,
       mediaId: mediaId!,
@@ -60,14 +60,16 @@ class FavDetailController extends GetxController {
     var result = await VideoHttp.favVideo(
         aid: id, addIds: '', delIds: mediaId.toString());
     if (result['status']) {
-      List dataList = favList;
+      if (result['data']['prompt']) {
-      for (var i in dataList) {
+        List dataList = favList;
-        if (i.id == id) {
+        for (var i in dataList) {
-          dataList.remove(i);
+          if (i.id == id) {
-          break;
+            dataList.remove(i);
+            break;
+          }
         }
+        SmartDialog.showToast('取消收藏');
       }
-      SmartDialog.showToast('取消收藏');
     }
   }
 

lib/pages/fav_detail/view.dart

@@ -24,12 +24,10 @@ class _FavDetailPageState extends State<FavDetailPage> {
       Get.put(FavDetailController());
   late StreamController<bool> titleStreamC; // a
   Future? _futureBuilderFuture;
-  late String mediaId;
 
   @override
   void initState() {
     super.initState();
-    mediaId = Get.parameters['mediaId']!;
     _futureBuilderFuture = _favDetailController.queryUserFavFolderDetail();
     titleStreamC = StreamController<bool>();
     _controller.addListener(
@@ -96,8 +94,8 @@ class _FavDetailPageState extends State<FavDetailPage> {
             ),
             actions: [
               IconButton(
-                onPressed: () =>
+                onPressed: () => Get.toNamed(
-                    Get.toNamed('/favSearch?searchType=0&mediaId=$mediaId'),
+                    '/favSearch?searchType=0&mediaId=${Get.parameters['mediaId']!}'),
                 icon: const Icon(Icons.search_outlined),
               ),
               //   IconButton(

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -9,20 +9,14 @@ import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import '../../../common/widgets/badge.dart';
 
 // 收藏视频卡片 - 水平布局
 class FavVideoCardH extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
-  final int? searchType;
 
-  const FavVideoCardH({
+  const FavVideoCardH({Key? key, required this.videoItem, this.callFn})
-    Key? key,
+      : super(key: key);
-    required this.videoItem,
-    this.callFn,
-    this.searchType,
-  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -33,9 +27,7 @@ class FavVideoCardH extends StatelessWidget {
       onTap: () async {
         // int? seasonId;
         String? epId;
-        if (videoItem.ogv != null &&
+        if (videoItem.ogv != null && videoItem.ogv['type_name'] == '番剧') {
-            (videoItem.ogv['type_name'] == '番剧' ||
-                videoItem.ogv['type_name'] == '国创')) {
           videoItem.cid = await SearchHttp.ab2c(bvid: bvid);
           // seasonId = videoItem.ogv['season_id'];
           epId = videoItem.epId;
@@ -92,31 +84,28 @@ class FavVideoCardH extends StatelessWidget {
                                     height: maxHeight,
                                   ),
                                 ),
-                                PBadge(
+                                Positioned(
-                                  text: Utils.timeFormat(videoItem.duration!),
+                                  right: 4,
-                                  right: 6.0,
+                                  bottom: 4,
-                                  bottom: 6.0,
+                                  child: Container(
-                                  type: 'gray',
+                                    padding: const EdgeInsets.symmetric(
-                                ),
+                                        vertical: 1, horizontal: 6),
-                                if (videoItem.ogv != null) ...[
+                                    decoration: BoxDecoration(
-                                  PBadge(
+                                        borderRadius: BorderRadius.circular(4),
-                                    text: videoItem.ogv['type_name'],
+                                        color: Colors.black54.withOpacity(0.4)),
-                                    top: 6.0,
+                                    child: Text(
-                                    right: 6.0,
+                                      Utils.timeFormat(videoItem.duration!),
-                                    bottom: null,
+                                      style: const TextStyle(
-                                    left: null,
+                                          fontSize: 11, color: Colors.white),
+                                    ),
                                   ),
-                                ],
+                                )
                               ],
                             );
                           },
                         ),
                       ),
-                      VideoContent(
+                      VideoContent(videoItem: videoItem, callFn: callFn)
-                        videoItem: videoItem,
-                        callFn: callFn,
-                        searchType: searchType,
-                      )
                     ],
                   ),
                 );
@@ -132,123 +121,93 @@ class FavVideoCardH extends StatelessWidget {
 class VideoContent extends StatelessWidget {
   final dynamic videoItem;
   final Function? callFn;
-  final int? searchType;
+  const VideoContent({super.key, required this.videoItem, this.callFn});
-  const VideoContent({
-    super.key,
-    required this.videoItem,
-    this.callFn,
-    this.searchType,
-  });
 
   @override
   Widget build(BuildContext context) {
     return Expanded(
       child: Padding(
         padding: const EdgeInsets.fromLTRB(10, 2, 6, 0),
-        child: Stack(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Column(
+            Text(
-              crossAxisAlignment: CrossAxisAlignment.start,
+              videoItem.title,
+              textAlign: TextAlign.start,
+              style: const TextStyle(
+                fontWeight: FontWeight.w500,
+                letterSpacing: 0.3,
+              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
+            ),
+            const Spacer(),
+            Text(
+              Utils.dateFormat(videoItem.ctime!),
+              style: TextStyle(
+                  fontSize: 11, color: Theme.of(context).colorScheme.outline),
+            ),
+            Text(
+              videoItem.owner.name,
+              style: TextStyle(
+                fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                color: Theme.of(context).colorScheme.outline,
+              ),
+            ),
+            Row(
               children: [
-                Text(
+                StatView(
-                  videoItem.title,
+                  theme: 'gray',
-                  textAlign: TextAlign.start,
+                  view: videoItem.cntInfo['play'],
-                  style: const TextStyle(
-                    fontWeight: FontWeight.w500,
-                    letterSpacing: 0.3,
-                  ),
-                  maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
                 ),
-                if (videoItem.ogv != null) ...[
+                const SizedBox(width: 8),
-                  Text(
+                StatDanMu(theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
-                    videoItem.intro,
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
-                ],
                 const Spacer(),
-                Text(
+                SizedBox(
-                  Utils.dateFormat(videoItem.favTime),
+                  width: 26,
-                  style: TextStyle(
+                  height: 26,
-                      fontSize: 11,
+                  child: IconButton(
-                      color: Theme.of(context).colorScheme.outline),
+                    style: ButtonStyle(
-                ),
+                      padding: MaterialStateProperty.all(EdgeInsets.zero),
-                if (videoItem.owner.name != '') ...[
+                    ),
-                  Text(
+                    onPressed: () {
-                    videoItem.owner.name,
+                      showDialog(
-                    style: TextStyle(
+                        context: Get.context!,
-                      fontSize:
+                        builder: (context) {
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                          return AlertDialog(
-                      color: Theme.of(context).colorScheme.outline,
+                            title: const Text('提示'),
+                            content: const Text('要取消收藏吗?'),
+                            actions: [
+                              TextButton(
+                                  onPressed: () => Get.back(),
+                                  child: Text(
+                                    '取消',
+                                    style: TextStyle(
+                                        color: Theme.of(context)
+                                            .colorScheme
+                                            .outline),
+                                  )),
+                              TextButton(
+                                onPressed: () async {
+                                  await callFn!();
+                                  Get.back();
+                                },
+                                child: const Text('确定取消'),
+                              )
+                            ],
+                          );
+                        },
+                      );
+                    },
+                    icon: Icon(
+                      Icons.clear_outlined,
+                      color: Theme.of(context).colorScheme.outline,
+                      size: 18,
                     ),
-                  ),
-                ],
-                Padding(
-                  padding: const EdgeInsets.only(top: 2),
-                  child: Row(
-                    children: [
-                      StatView(
-                        theme: 'gray',
-                        view: videoItem.cntInfo['play'],
-                      ),
-                      const SizedBox(width: 8),
-                      StatDanMu(
-                          theme: 'gray', danmu: videoItem.cntInfo['danmaku']),
-                      const Spacer(),
-                    ],
                   ),
                 ),
               ],
             ),
-            searchType != 1
-                ? Positioned(
-                    right: 0,
-                    bottom: -4,
-                    child: IconButton(
-                      style: ButtonStyle(
-                        padding: MaterialStateProperty.all(EdgeInsets.zero),
-                      ),
-                      onPressed: () {
-                        showDialog(
-                          context: Get.context!,
-                          builder: (context) {
-                            return AlertDialog(
-                              title: const Text('提示'),
-                              content: const Text('要取消收藏吗?'),
-                              actions: [
-                                TextButton(
-                                    onPressed: () => Get.back(),
-                                    child: Text(
-                                      '取消',
-                                      style: TextStyle(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .outline),
-                                    )),
-                                TextButton(
-                                  onPressed: () async {
-                                    await callFn!();
-                                    Get.back();
-                                  },
-                                  child: const Text('确定取消'),
-                                )
-                              ],
-                            );
-                          },
-                        );
-                      },
-                      icon: Icon(
-                        Icons.clear_outlined,
-                        color: Theme.of(context).colorScheme.outline,
-                        size: 18,
-                      ),
-                    ),
-                  )
-                : const SizedBox(),
           ],
         ),
       ),

lib/pages/fav_search/controller.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/user/fav_detail.dart';
 
-import '../../http/video.dart';
-
 class FavSearchController extends GetxController {
   final ScrollController scrollController = ScrollController();
   Rx<TextEditingController> controller = TextEditingController().obs;
@@ -75,19 +72,4 @@ class FavSearchController extends GetxController {
     if (!hasMore) return;
     searchFav(type: 'onLoad');
   }
-
-  onCancelFav(int id) async {
-    var result = await VideoHttp.favVideo(
-        aid: id, addIds: '', delIds: mediaId.toString());
-    if (result['status']) {
-      List dataList = favList;
-      for (var i in dataList) {
-        if (i.id == id) {
-          dataList.remove(i);
-          break;
-        }
-      }
-      SmartDialog.showToast('取消收藏');
-    }
-  }
 }

lib/pages/fav_search/view.dart

@@ -8,7 +8,9 @@ import 'package:pilipala/pages/fav_detail/widget/fav_video_card.dart';
 import 'controller.dart';
 
 class FavSearchPage extends StatefulWidget {
-  const FavSearchPage({super.key});
+  final int? sourceType;
+  final int? mediaId;
+  const FavSearchPage({super.key, this.sourceType, this.mediaId});
 
   @override
   State<FavSearchPage> createState() => _FavSearchPageState();
@@ -17,12 +19,11 @@ class FavSearchPage extends StatefulWidget {
 class _FavSearchPageState extends State<FavSearchPage> {
   final FavSearchController _favSearchCtr = Get.put(FavSearchController());
   late ScrollController scrollController;
-  late int searchType;
 
   @override
   void initState() {
     super.initState();
-    searchType = int.parse(Get.parameters['searchType']!);
+
     scrollController = _favSearchCtr.scrollController;
     scrollController.addListener(
       () {
@@ -99,11 +100,7 @@ class _FavSearchPageState extends State<FavSearchPage> {
                       } else {
                         return FavVideoCardH(
                           videoItem: _favSearchCtr.favList[index],
-                          searchType: searchType,
+                          callFn: () => null,
-                          callFn: () => searchType != 1
-                              ? _favSearchCtr
-                                  .onCancelFav(_favSearchCtr.favList[index].id!)
-                              : {},
                         );
                       }
                     },

lib/pages/follow/view.dart

@@ -37,29 +37,6 @@ class _FollowPageState extends State<FollowPage> {
               : '${_followController.name}的关注',
           style: Theme.of(context).textTheme.titleMedium,
         ),
-        actions: [
-          IconButton(
-            onPressed: () => Get.toNamed('/followSearch?mid=$mid'),
-            icon: const Icon(Icons.search_outlined),
-          ),
-          PopupMenuButton(
-            icon: const Icon(Icons.more_vert),
-            itemBuilder: (BuildContext context) => <PopupMenuEntry>[
-              PopupMenuItem(
-                onTap: () => Get.toNamed('/blackListPage'),
-                child: const Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Icon(Icons.block, size: 19),
-                    SizedBox(width: 10),
-                    Text('黑名单管理'),
-                  ],
-                ),
-              )
-            ],
-          ),
-          const SizedBox(width: 6),
-        ],
       ),
       body: Obx(
         () => !_followController.isOwner.value
@@ -110,22 +87,3 @@ class _FollowPageState extends State<FollowPage> {
     );
   }
 }
-
-class _FakeAPI {
-  static const List<String> _kOptions = <String>[
-    'aardvark',
-    'bobcat',
-    'chameleon',
-  ];
-  // Searches the options, but injects a fake "network" delay.
-  static Future<Iterable<String>> search(String query) async {
-    await Future<void>.delayed(
-        const Duration(seconds: 1)); // Fake 1 second delay.
-    if (query == '') {
-      return const Iterable<String>.empty();
-    }
-    return _kOptions.where((String option) {
-      return option.contains(query.toLowerCase());
-    });
-  }
-}

lib/pages/follow/widgets/follow_item.dart

@@ -42,7 +42,7 @@ class FollowItem extends StatelessWidget {
         overflow: TextOverflow.ellipsis,
       ),
       dense: true,
-      trailing: ctr != null && ctr!.isOwner.value
+      trailing: ctr!.isOwner.value
           ? SizedBox(
               height: 34,
               child: TextButton(

lib/pages/follow_search/controller.dart

@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/http/member.dart';
-
-import '../../models/follow/result.dart';
-
-class FollowSearchController extends GetxController {
-  Rx<TextEditingController> controller = TextEditingController().obs;
-  final FocusNode searchFocusNode = FocusNode();
-  RxString searchKeyWord = ''.obs;
-  String hintText = '搜索';
-  RxString loadingStatus = 'init'.obs;
-  late int mid = 1;
-  RxString uname = ''.obs;
-  int ps = 20;
-  int pn = 1;
-  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
-  RxInt total = 0.obs;
-
-  @override
-  void onInit() {
-    super.onInit();
-    mid = int.parse(Get.parameters['mid']!);
-  }
-
-  // 清空搜索
-  void onClear() {
-    if (searchKeyWord.value.isNotEmpty && controller.value.text != '') {
-      controller.value.clear();
-      searchKeyWord.value = '';
-    } else {
-      Get.back();
-    }
-  }
-
-  void onChange(value) {
-    searchKeyWord.value = value;
-  }
-
-  //  提交搜索内容
-  void submit() {
-    loadingStatus.value = 'loading';
-    searchFollow();
-  }
-
-  Future searchFollow({type = 'init'}) async {
-    if (controller.value.text == '') {
-      return {'status': true, 'data': <FollowItemModel>[].obs};
-    }
-    if (type == 'init') {
-      ps = 1;
-    }
-    var res = await MemberHttp.getfollowSearch(
-      mid: mid,
-      ps: ps,
-      pn: pn,
-      name: controller.value.text,
-    );
-    if (res['status']) {
-      if (type == 'init') {
-        followList.value = res['data'].list;
-      } else {
-        followList.addAll(res['data'].list);
-      }
-      total.value = res['data'].total;
-    }
-    return res;
-  }
-
-  void onLoad() {
-    searchFollow(type: 'onLoad');
-  }
-}

lib/pages/follow_search/index.dart

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

lib/pages/follow_search/view.dart

@@ -1,121 +0,0 @@
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/pages/follow_search/index.dart';
-
-import '../follow/widgets/follow_item.dart';
-
-class FollowSearchPage extends StatefulWidget {
-  const FollowSearchPage({super.key});
-
-  @override
-  State<FollowSearchPage> createState() => _FollowSearchPageState();
-}
-
-class _FollowSearchPageState extends State<FollowSearchPage> {
-  final FollowSearchController _followSearchController =
-      Get.put(FollowSearchController());
-  late Future? _futureBuilder;
-  final ScrollController scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    _futureBuilder = _followSearchController.searchFollow();
-    scrollController.addListener(
-      () {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 500), () {
-            _followSearchController.onLoad();
-          });
-        }
-      },
-    );
-  }
-
-  void reRequest() {
-    setState(() {
-      _futureBuilder = _followSearchController.searchFollow();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        titleSpacing: 0,
-        actions: [
-          IconButton(
-            onPressed: reRequest,
-            icon: const Icon(CupertinoIcons.search, size: 22),
-          ),
-          const SizedBox(width: 6),
-        ],
-        title: TextField(
-          autofocus: true,
-          focusNode: _followSearchController.searchFocusNode,
-          controller: _followSearchController.controller.value,
-          textInputAction: TextInputAction.search,
-          onChanged: (value) => _followSearchController.onChange(value),
-          decoration: InputDecoration(
-            hintText: _followSearchController.hintText,
-            border: InputBorder.none,
-            suffixIcon: IconButton(
-              icon: Icon(
-                Icons.clear,
-                size: 22,
-                color: Theme.of(context).colorScheme.outline,
-              ),
-              onPressed: () => _followSearchController.onClear(),
-            ),
-          ),
-          onSubmitted: (String value) => reRequest(),
-        ),
-      ),
-      body: FutureBuilder(
-          future: _futureBuilder,
-          builder: (BuildContext context, AsyncSnapshot snapshot) {
-            if (snapshot.connectionState == ConnectionState.done) {
-              var data = snapshot.data;
-              if (data == null) {
-                return CustomScrollView(
-                  slivers: [
-                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
-                  ],
-                );
-              }
-              if (data['status']) {
-                RxList followList = _followSearchController.followList;
-                return Obx(
-                  () => followList.isNotEmpty
-                      ? ListView.builder(
-                          controller: scrollController,
-                          itemCount: followList.length,
-                          itemBuilder: ((context, index) {
-                            return FollowItem(
-                              item: followList[index],
-                            );
-                          }),
-                        )
-                      : CustomScrollView(
-                          slivers: [HttpError(errMsg: '未搜索到结果', fn: reRequest)],
-                        ),
-                );
-              } else {
-                return CustomScrollView(
-                  slivers: [
-                    HttpError(errMsg: snapshot.data['msg'], fn: reRequest)
-                  ],
-                );
-              }
-            } else {
-              return const SizedBox();
-            }
-          }),
-    );
-  }
-}

lib/pages/history/view.dart

@@ -70,6 +70,10 @@ class _HistoryPageState extends State<HistoryPage> {
         child1: AppBar(
           titleSpacing: 0,
           centerTitle: false,
+          leading: IconButton(
+            onPressed: () => Get.back(),
+            icon: const Icon(Icons.arrow_back_outlined),
+          ),
           title: Text(
             '观看记录',
             style: Theme.of(context).textTheme.titleMedium,

lib/pages/home/controller.dart

@@ -26,7 +26,6 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
   late List defaultTabs;
   late List<String> tabbarSort;
   RxString defaultSearch = ''.obs;
-  late bool enableGradientBg;
 
   @override
   void onInit() {
@@ -34,15 +33,13 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     userFace.value = userInfo != null ? userInfo.face : '';
+    // 进行tabs配置
+    setTabConfig();
     hideSearchBar =
         setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
     if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
       searchDefault();
     }
-    enableGradientBg =
-        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
-    // 进行tabs配置
-    setTabConfig();
   }
 
   void onRefresh() {
@@ -91,21 +88,19 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
       vsync: this,
     );
     // 监听 tabController 切换
-    if (enableGradientBg) {
+    tabController.animation!.addListener(() {
-      tabController.animation!.addListener(() {
+      if (tabController.indexIsChanging) {
-        if (tabController.indexIsChanging) {
+        if (initialIndex.value != tabController.index) {
-          if (initialIndex.value != tabController.index) {
+          initialIndex.value = tabController.index;
-            initialIndex.value = tabController.index;
-          }
-        } else {
-          final int temp = tabController.animation!.value.round();
-          if (initialIndex.value != temp) {
-            initialIndex.value = temp;
-            tabController.index = initialIndex.value;
-          }
         }
-      });
+      } else {
-    }
+        final int temp = tabController.animation!.value.round();
+        if (initialIndex.value != temp) {
+          initialIndex.value = temp;
+          tabController.index = initialIndex.value;
+        }
+      }
+    });
   }
 
   void searchDefault() async {

lib/pages/home/view.dart

@@ -48,51 +48,38 @@ class _HomePageState extends State<HomePage>
     super.build(context);
     Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
     // 设置状态栏图标的亮度
-    if (_homeController.enableGradientBg) {
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarIconBrightness: currentBrightness == Brightness.light
-        statusBarIconBrightness: currentBrightness == Brightness.light
+          ? Brightness.dark
-            ? Brightness.dark
+          : Brightness.light,
-            : Brightness.light,
+    ));
-      ));
-    }
     return Scaffold(
       extendBody: true,
       extendBodyBehindAppBar: true,
-      appBar: _homeController.enableGradientBg
-          ? null
-          : AppBar(toolbarHeight: 0, elevation: 0),
       body: Stack(
         children: [
           // gradient background
-          if (_homeController.enableGradientBg) ...[
+          Align(
-            Align(
+            alignment: Alignment.topLeft,
-              alignment: Alignment.topLeft,
+            child: Opacity(
-              child: Opacity(
+              opacity: 0.6,
-                opacity: 0.6,
+              child: Container(
-                child: Container(
+                width: MediaQuery.of(context).size.width,
-                  width: MediaQuery.of(context).size.width,
+                height: MediaQuery.of(context).size.height,
-                  height: MediaQuery.of(context).size.height,
+                decoration: BoxDecoration(
-                  decoration: BoxDecoration(
+                  gradient: LinearGradient(
-                    gradient: LinearGradient(
+                      colors: [
-                        colors: [
+                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
-                          Theme.of(context)
+                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
-                              .colorScheme
+                        Theme.of(context).colorScheme.surface
-                              .primary
+                      ],
-                              .withOpacity(0.9),
+                      begin: Alignment.topLeft,
-                          Theme.of(context)
+                      end: Alignment.bottomRight,
-                              .colorScheme
+                      stops: const [0, 0.0034, 0.34]),
-                              .primary
-                              .withOpacity(0.5),
-                          Theme.of(context).colorScheme.surface
-                        ],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        stops: const [0, 0.0034, 0.34]),
-                  ),
                 ),
               ),
             ),
-          ],
+          ),
           Column(
             children: [
               CustomAppBar(
@@ -103,37 +90,7 @@ class _HomePageState extends State<HomePage>
                 callback: showUserBottomSheet,
               ),
               if (_homeController.tabs.length > 1) ...[
-                if (_homeController.enableGradientBg) ...[
+                const CustomTabs(),
-                  const CustomTabs(),
-                ] else ...[
-                  const SizedBox(height: 4),
-                  SizedBox(
-                    width: double.infinity,
-                    height: 42,
-                    child: Align(
-                      alignment: Alignment.center,
-                      child: TabBar(
-                        controller: _homeController.tabController,
-                        tabs: [
-                          for (var i in _homeController.tabs)
-                            Tab(text: i['label'])
-                        ],
-                        isScrollable: true,
-                        dividerColor: Colors.transparent,
-                        enableFeedback: true,
-                        splashBorderRadius: BorderRadius.circular(10),
-                        tabAlignment: TabAlignment.center,
-                        onTap: (value) {
-                          feedBack();
-                          if (_homeController.initialIndex.value == value) {
-                            _homeController.tabsCtrList[value]().animateToTop();
-                          }
-                          _homeController.initialIndex.value = value;
-                        },
-                      ),
-                    ),
-                  ),
-                ],
               ] else ...[
                 const SizedBox(height: 6),
               ],
@@ -415,16 +372,13 @@ class SearchBar extends StatelessWidget {
                 ),
                 const SizedBox(width: 10),
                 Obx(
-                  () => Expanded(
+                  () => Text(
-                    child: Text(
+                    ctr!.defaultSearch.value,
-                      ctr!.defaultSearch.value,
+                    maxLines: 1,
-                      maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
-                      overflow: TextOverflow.ellipsis,
+                    style: TextStyle(color: colorScheme.outline),
-                      style: TextStyle(color: colorScheme.outline),
-                    ),
                   ),
                 ),
-                const SizedBox(width: 15),
               ],
             ),
           ),

lib/pages/hot/controller.dart

@@ -7,7 +7,7 @@ class HotController extends GetxController {
   final ScrollController scrollController = ScrollController();
   final int _count = 20;
   int _currentPage = 1;
-  RxList<HotVideoItemModel> videoList = <HotVideoItemModel>[].obs;
+  RxList<HotVideoItemModel> videoList = [HotVideoItemModel()].obs;
   bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;

lib/pages/hot/view.dart

@@ -89,7 +89,8 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   if (data['status']) {
                     return Obx(
                       () => SliverList(
-                        delegate: SliverChildBuilderDelegate((context, index) {
+                        delegate:
+                            SliverChildBuilderDelegate((context, index) {
                           return VideoCardH(
                             videoItem: _hotController.videoList[index],
                             showPubdate: true,
@@ -109,12 +110,7 @@ class _HotPageState extends State<HotPage> with AutomaticKeepAliveClientMixin {
                   } else {
                     return HttpError(
                       errMsg: data['msg'],
-                      fn: () {
+                      fn: () => setState(() {}),
-                        setState(() {
-                          _futureBuilderFuture =
-                              _hotController.queryHotFeed('init');
-                        });
-                      },
                     );
                   }
                 } else {

lib/pages/html/controller.dart

@@ -96,6 +96,9 @@ class HtmlRenderController extends GetxController {
         _sortType = ReplySortType.like;
         break;
       case ReplySortType.like:
+        _sortType = ReplySortType.reply;
+        break;
+      case ReplySortType.reply:
         _sortType = ReplySortType.time;
         break;
       default:

lib/pages/live/controller.dart

@@ -10,7 +10,8 @@ class LiveController extends GetxController {
   int count = 12;
   int _currentPage = 1;
   RxInt crossAxisCount = 2.obs;
-  RxList<LiveItemModel> liveList = <LiveItemModel>[].obs;
+  RxList<LiveItemModel> liveList = [LiveItemModel()].obs;
+  bool isLoadingMore = false;
   bool flag = false;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
@@ -38,6 +39,7 @@ class LiveController extends GetxController {
       }
       _currentPage += 1;
     }
+    isLoadingMore = false;
     return res;
   }
 

lib/pages/live/view.dart

@@ -11,6 +11,7 @@ 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';
 
 import 'controller.dart';
 import 'widgets/live_item.dart';
@@ -44,8 +45,8 @@ class _LivePageState extends State<LivePage>
       () {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
-          EasyThrottle.throttle('liveList', const Duration(milliseconds: 200),
+          EasyThrottle.throttle('liveList', const Duration(seconds: 1), () {
-              () {
+            _liveController.isLoadingMore = true;
             _liveController.onLoad();
           });
         }
@@ -107,20 +108,24 @@ class _LivePageState extends State<LivePage>
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
-                        fn: () {
+                        fn: () => {},
-                          setState(() {
-                            _futureBuilderFuture =
-                                _liveController.queryLiveList('init');
-                          });
-                        },
                       );
                     }
                   } else {
-                    return contentGrid(_liveController, []);
+                    // 缓存数据
+                    if (_liveController.liveList.length > 1) {
+                      return contentGrid(
+                          _liveController, _liveController.liveList);
+                    }
+                    // 骨架屏
+                    else {
+                      return contentGrid(_liveController, []);
+                    }
                   }
                 },
               ),
             ),
+            LoadingMore(ctr: _liveController)
           ],
         ),
       ),

lib/pages/live/widgets/live_item.dart

@@ -184,32 +184,18 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: Row(
+      child: RichText(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        maxLines: 1,
-        children: [
+        textAlign: TextAlign.justify,
-          Text(
+        softWrap: false,
-            liveItem!.areaName!,
+        text: TextSpan(
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
+          children: [
-          Text(
+            TextSpan(text: liveItem!.areaName!),
-            liveItem!.watchedShow!['text_small'],
+            TextSpan(text: liveItem!.watchedShow!['text_small']),
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          ],
-          ),
+        ),
-        ],
       ),
-
-      // child: RichText(
-      //   maxLines: 1,
-      //   textAlign: TextAlign.justify,
-      //   softWrap: false,
-      //   text: TextSpan(
-      //     style: const TextStyle(fontSize: 11, color: Colors.white),
-      //     children: [
-      //       TextSpan(text: liveItem!.areaName!),
-      //       TextSpan(text: liveItem!.watchedShow!['text_small']),
-      //     ],
-      //   ),
-      // ),
     );
   }
 }

lib/pages/live_room/controller.dart

@@ -3,9 +3,6 @@ import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/live.dart';
 import 'package:pilipala/models/live/room_info.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
-import '../../models/live/room_info_h5.dart';
-import '../../utils/storage.dart';
-import '../../utils/video_utils.dart';
 
 class LiveRoomController extends GetxController {
   String cover = '';
@@ -17,8 +14,13 @@ class LiveRoomController extends GetxController {
   RxBool volumeOff = false.obs;
   PlPlayerController plPlayerController =
       PlPlayerController.getInstance(videoType: 'live');
-  Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
+
-  late bool enableCDN;
+  // MeeduPlayerController meeduPlayerController = MeeduPlayerController(
+  //   colorTheme: Theme.of(Get.context!).colorScheme.primary,
+  //   pipEnabled: true,
+  //   controlsStyle: ControlsStyle.live,
+  //   enabledButtons: const EnabledButtons(pip: true),
+  // );
 
   @override
   void onInit() {
@@ -34,12 +36,11 @@ class LiveRoomController extends GetxController {
         cover = liveItem.cover;
       }
     }
-    // CDN优化
+    queryLiveInfo();
-    enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
   }
 
-  playerInit(source) async {
+  playerInit(source) {
-    await plPlayerController.setDataSource(
+    plPlayerController.setDataSource(
       DataSource(
         videoSource: source,
         audioSource: null,
@@ -62,13 +63,10 @@ class LiveRoomController extends GetxController {
       List<CodecItem> codec =
           res['data'].playurlInfo.playurl.stream.first.format.first.codec;
       CodecItem item = codec.first;
-      String videoUrl = enableCDN
+      String videoUrl = (item.urlInfo?.first.host)! +
-          ? VideoUtils.getCdnUrl(item)
+          item.baseUrl! +
-          : (item.urlInfo?.first.host)! +
+          item.urlInfo!.first.extra!;
-              item.baseUrl! +
+      playerInit(videoUrl);
-              item.urlInfo!.first.extra!;
-      await playerInit(videoUrl);
-      return res;
     }
   }
 
@@ -82,12 +80,4 @@ class LiveRoomController extends GetxController {
       volumeOff.value = true;
     }
   }
-
-  Future queryLiveInfoH5() async {
-    var res = await LiveHttp.liveRoomInfoH5(roomId: roomId);
-    if (res['status']) {
-      roomInfoH5.value = res['data'];
-    }
-    return res;
-  }
 }

lib/pages/live_room/view.dart

@@ -19,8 +19,6 @@ class LiveRoomPage extends StatefulWidget {
 class _LiveRoomPageState extends State<LiveRoomPage> {
   final LiveRoomController _liveRoomController = Get.put(LiveRoomController());
   PlPlayerController? plPlayerController;
-  late Future? _futureBuilder;
-  late Future? _futureBuilderFuture;
 
   bool isShowCover = true;
   bool isPlay = true;
@@ -29,16 +27,18 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
   @override
   void initState() {
     super.initState();
+    plPlayerController = _liveRoomController.plPlayerController;
+    plPlayerController!.onPlayerStatusChanged.listen(
+      (PlayerStatus status) {
+        if (status == PlayerStatus.playing) {
+          isShowCover = false;
+          setState(() {});
+        }
+      },
+    );
     if (Platform.isAndroid) {
       floating = Floating();
     }
-    videoSourceInit();
-    _futureBuilderFuture = _liveRoomController.queryLiveInfo();
-  }
-
-  Future<void> videoSourceInit() async {
-    _futureBuilder = _liveRoomController.queryLiveInfoH5();
-    plPlayerController = _liveRoomController.plPlayerController;
   }
 
   @override
@@ -52,127 +52,57 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
 
   @override
   Widget build(BuildContext context) {
-    Widget videoPlayerPanel = FutureBuilder(
-      future: _futureBuilderFuture,
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData && snapshot.data['status']) {
-          return PLVideoPlayer(
-            controller: plPlayerController!,
-            bottomControl: BottomControl(
-              controller: plPlayerController,
-              liveRoomCtr: _liveRoomController,
-              floating: floating,
-            ),
-          );
-        } else {
-          return const SizedBox();
-        }
-      },
-    );
-
     Widget childWhenDisabled = Scaffold(
       primary: true,
-      backgroundColor: Colors.black,
+      appBar: PreferredSize(
-      body: Stack(
+        preferredSize: Size.fromHeight(
-        children: [
+          MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0,
-          Positioned(
+        ),
-            left: 0,
+        child: AppBar(
-            right: 0,
+          centerTitle: false,
-            bottom: 0,
+          titleSpacing: 0,
-            child: Opacity(
+          title: _liveRoomController.liveItem != null
-              opacity: 0.8,
+              ? Row(
-              child: Image.asset(
+                  children: [
-                'assets/images/live/default_bg.webp',
+                    NetworkImgLayer(
-                fit: BoxFit.cover,
+                      width: 34,
-                // width: Get.width,
+                      height: 34,
-                // height: Get.height,
+                      type: 'avatar',
-              ),
+                      src: _liveRoomController.liveItem.face,
-            ),
+                    ),
-          ),
+                    const SizedBox(width: 10),
-          Obx(
+                    Column(
-            () => Positioned(
+                      crossAxisAlignment: CrossAxisAlignment.start,
-              left: 0,
+                      children: [
-              right: 0,
+                        Text(
-              bottom: 0,
+                          _liveRoomController.liveItem.uname,
-              child: _liveRoomController
+                          style: const TextStyle(fontSize: 14),
-                              .roomInfoH5.value.roomInfo?.appBackground !=
-                          '' &&
-                      _liveRoomController
-                              .roomInfoH5.value.roomInfo?.appBackground !=
-                          null
-                  ? Opacity(
-                      opacity: 0.8,
-                      child: NetworkImgLayer(
-                        width: Get.width,
-                        height: Get.height,
-                        type: 'bg',
-                        src: _liveRoomController
-                                .roomInfoH5.value.roomInfo?.appBackground ??
-                            '',
-                      ),
-                    )
-                  : const SizedBox(),
-            ),
-          ),
-          Column(
-            children: [
-              AppBar(
-                centerTitle: false,
-                titleSpacing: 0,
-                backgroundColor: Colors.transparent,
-                foregroundColor: Colors.white,
-                toolbarHeight:
-                    MediaQuery.of(context).orientation == Orientation.portrait
-                        ? 56
-                        : 0,
-                title: FutureBuilder(
-                  future: _futureBuilder,
-                  builder: (context, snapshot) {
-                    if (snapshot.data == null) {
-                      return const SizedBox();
-                    }
-                    Map data = snapshot.data as Map;
-                    if (data['status']) {
-                      return Obx(
-                        () => Row(
-                          children: [
-                            NetworkImgLayer(
-                              width: 34,
-                              height: 34,
-                              type: 'avatar',
-                              src: _liveRoomController
-                                  .roomInfoH5.value.anchorInfo!.baseInfo!.face,
-                            ),
-                            const SizedBox(width: 10),
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  _liveRoomController.roomInfoH5.value
-                                      .anchorInfo!.baseInfo!.uname!,
-                                  style: const TextStyle(fontSize: 14),
-                                ),
-                                const SizedBox(height: 1),
-                                if (_liveRoomController
-                                        .roomInfoH5.value.watchedShow !=
-                                    null)
-                                  Text(
-                                    _liveRoomController.roomInfoH5.value
-                                            .watchedShow!['text_large'] ??
-                                        '',
-                                    style: const TextStyle(fontSize: 12),
-                                  ),
-                              ],
-                            ),
-                          ],
                         ),
-                      );
+                        const SizedBox(height: 1),
-                    } else {
+                        if (_liveRoomController.liveItem.watchedShow != null)
-                      return const SizedBox();
+                          Text(
-                    }
+                              _liveRoomController
-                  },
+                                      .liveItem.watchedShow['text_large'] ??
-                ),
+                                  '',
-              ),
+                              style: const TextStyle(fontSize: 12)),
+                      ],
+                    ),
+                  ],
+                )
+              : const SizedBox(),
+          // actions: [
+          //   SizedBox(
+          //     height: 34,
+          //     child: ElevatedButton(onPressed: () {}, child: const Text('关注')),
+          //   ),
+          //   const SizedBox(width: 12),
+          // ],
+        ),
+      ),
+      body: Column(
+        children: [
+          Stack(
+            children: [
               PopScope(
                 canPop: plPlayerController?.isFullScreen.value != true,
                 onPopInvoked: (bool didPop) {
@@ -190,19 +120,55 @@ class _LiveRoomPageState extends State<LiveRoomPage> {
                           Orientation.landscape
                       ? Get.size.height
                       : Get.size.width * 9 / 16,
-                  child: videoPlayerPanel,
+                  child: plPlayerController!.videoPlayerController != null
+                      ? PLVideoPlayer(
+                          controller: plPlayerController!,
+                          bottomControl: BottomControl(
+                            controller: plPlayerController,
+                            liveRoomCtr: _liveRoomController,
+                            floating: floating,
+                          ),
+                        )
+                      : const SizedBox(),
                 ),
               ),
+              // if (_liveRoomController.liveItem != null &&
+              //     _liveRoomController.liveItem.cover != null)
+              //   Visibility(
+              //     visible: isShowCover,
+              //     child: Positioned(
+              //       top: 0,
+              //       left: 0,
+              //       right: 0,
+              //       child: NetworkImgLayer(
+              //         type: 'emote',
+              //         src: _liveRoomController.liveItem.cover,
+              //         width: Get.size.width,
+              //         height: videoHeight,
+              //       ),
+              //     ),
+              //   ),
             ],
           ),
         ],
       ),
     );
+    Widget childWhenEnabled = AspectRatio(
+      aspectRatio: 16 / 9,
+      child: plPlayerController!.videoPlayerController != null
+          ? PLVideoPlayer(
+              controller: plPlayerController!,
+              bottomControl: BottomControl(
+                controller: plPlayerController,
+                liveRoomCtr: _liveRoomController,
+              ),
+            )
+          : const SizedBox(),
+    );
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: videoPlayerPanel,
+        childWhenEnabled: childWhenEnabled,
-        floating: floating,
       );
     } else {
       return childWhenDisabled;

lib/pages/main/controller.dart

@@ -12,7 +12,6 @@ import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../models/common/dynamic_badge_mode.dart';
-import '../../models/common/nav_bar_config.dart';
 
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[
@@ -20,7 +19,44 @@ class MainController extends GetxController {
     const DynamicsPage(),
     const MediaPage(),
   ];
-  RxList navigationBars = defaultNavigationBars.obs;
+  RxList navigationBars = [
+    {
+      'icon': const Icon(
+        Icons.home_outlined,
+        size: 21,
+      ),
+      'selectIcon': const Icon(
+        Icons.home,
+        size: 21,
+      ),
+      'label': "首页",
+      'count': 0,
+    },
+    {
+      'icon': const Icon(
+        Icons.motion_photos_on_outlined,
+        size: 21,
+      ),
+      'selectIcon': const Icon(
+        Icons.motion_photos_on,
+        size: 21,
+      ),
+      'label': "动态",
+      'count': 0,
+    },
+    {
+      'icon': const Icon(
+        Icons.video_collection_outlined,
+        size: 20,
+      ),
+      'selectIcon': const Icon(
+        Icons.video_collection,
+        size: 21,
+      ),
+      'label': "媒体库",
+      'count': 0,
+    }
+  ].obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
@@ -39,10 +75,6 @@ class MainController extends GetxController {
       Utils.checkUpdata();
     }
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
-    int defaultHomePage =
-        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0) as int;
-    selectedIndex = defaultNavigationBars
-        .indexWhere((item) => item['id'] == defaultHomePage);
     var userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(

lib/pages/media/controller.dart

@@ -28,11 +28,6 @@ class MediaController extends GetxController {
       'title': '我的收藏',
       'onTap': () => Get.toNamed('/fav'),
     },
-    {
-      'icon': Icons.subscriptions_outlined,
-      'title': '我的订阅',
-      'onTap': () => Get.toNamed('/subscription'),
-    },
     {
       'icon': Icons.watch_later_outlined,
       'title': '稍后再看',

lib/pages/member/controller.dart

@@ -20,7 +20,7 @@ class MemberController extends GetxController {
   Box userInfoCache = GStrorage.userInfo;
   late int ownerMid;
   // 投稿列表
-  RxList<VListItemModel>? archiveList = <VListItemModel>[].obs;
+  RxList<VListItemModel>? archiveList = [VListItemModel()].obs;
   dynamic userInfo;
   RxInt attribute = (-1).obs;
   RxString attributeText = '关注'.obs;

lib/pages/member/view.dart

@@ -105,7 +105,7 @@ class _MemberPageState extends State<MemberPage>
             actions: [
               IconButton(
                 onPressed: () => Get.toNamed(
-                    '/memberSearch?mid=$mid&uname=${_memberController.memberInfo.value.name!}'),
+                    '/memberSearch?mid=${Get.parameters['mid']}&uname=${_memberController.memberInfo.value.name!}'),
                 icon: const Icon(Icons.search_outlined),
               ),
               PopupMenuButton(

lib/pages/member_archive/controller.dart

@@ -25,7 +25,7 @@ class MemberArchiveController extends GetxController {
 
   // 获取用户投稿
   Future getMemberArchive(type) async {
-    if (type == 'init') {
+    if (type == 'onRefresh') {
       pn = 1;
     }
     var res = await MemberHttp.memberArchive(
@@ -34,12 +34,7 @@ class MemberArchiveController extends GetxController {
       order: currentOrder['type']!,
     );
     if (res['status']) {
-      if (type == 'init') {
+      archivesList.addAll(res['data'].list.vlist);
-        archivesList.value = res['data'].list.vlist;
-      }
-      if (type == 'onLoad') {
-        archivesList.addAll(res['data'].list.vlist);
-      }
       count = res['data'].page['count'];
       pn += 1;
     }
@@ -47,14 +42,13 @@ class MemberArchiveController extends GetxController {
   }
 
   toggleSort() async {
-    List<String> typeList = orderList.map((e) => e['type']!).toList();
+    pn = 1;
-    int index = typeList.indexOf(currentOrder['type']!);
+    int index = orderList.indexOf(currentOrder);
     if (index == orderList.length - 1) {
       currentOrder.value = orderList.first;
     } else {
       currentOrder.value = orderList[index + 1];
     }
-    getMemberArchive('init');
   }
 
   // 上拉加载

lib/pages/member_archive/view.dart

@@ -3,7 +3,6 @@ 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 '../../common/widgets/http_error.dart';
 import 'controller.dart';
 
 class MemberArchivePage extends StatefulWidget {
@@ -26,7 +25,8 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
     final String heroTag = Utils.makeHeroTag(mid);
     _memberArchivesController =
         Get.put(MemberArchiveController(), tag: heroTag);
-    _futureBuilderFuture = _memberArchivesController.getMemberArchive('init');
+    _futureBuilderFuture =
+        _memberArchivesController.getMemberArchive('onRefresh');
     scrollController = _memberArchivesController.scrollController;
     scrollController.addListener(
       () {
@@ -48,16 +48,39 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
         titleSpacing: 0,
         centerTitle: false,
         title: Text('他的投稿', style: Theme.of(context).textTheme.titleMedium),
-        actions: [
+        // actions: [
-          Obx(
+        //   Obx(
-            () => TextButton.icon(
+        //     () => PopupMenuButton<String>(
-              icon: const Icon(Icons.sort, size: 20),
+        //       padding: EdgeInsets.zero,
-              onPressed: _memberArchivesController.toggleSort,
+        //       tooltip: '投稿排序',
-              label: Text(_memberArchivesController.currentOrder['label']!),
+        //       icon: Icon(
-            ),
+        //         Icons.more_vert_outlined,
-          ),
+        //         color: Theme.of(context).colorScheme.outline,
-          const SizedBox(width: 6),
+        //       ),
-        ],
+        //       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,
@@ -87,16 +110,10 @@ class _MemberArchivePageState extends State<MemberArchivePage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return HttpError(
+                    return const SliverToBoxAdapter();
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
                   }
                 } else {
-                  return HttpError(
+                  return const SliverToBoxAdapter();
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/member_dynamics/view.dart

@@ -4,7 +4,6 @@ import 'package:get/get.dart';
 import 'package:pilipala/pages/member_dynamics/index.dart';
 import 'package:pilipala/utils/utils.dart';
 
-import '../../common/widgets/http_error.dart';
 import '../dynamics/widgets/dynamic_panel.dart';
 
 class MemberDynamicsPage extends StatefulWidget {
@@ -81,16 +80,10 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage> {
                           : const SliverToBoxAdapter(),
                     );
                   } else {
-                    return HttpError(
+                    return const SliverToBoxAdapter();
-                      errMsg: snapshot.data['msg'],
-                      fn: () {},
-                    );
                   }
                 } else {
-                  return HttpError(
+                  return const SliverToBoxAdapter();
-                    errMsg: snapshot.data['msg'],
-                    fn: () {},
-                  );
                 }
               } else {
                 return const SliverToBoxAdapter();

lib/pages/mine/controller.dart

@@ -119,7 +119,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/follow?mid=${userInfo.value.mid}', preventDuplicates: false);
+    Get.toNamed('/follow?mid=${userInfo.value.mid}');
   }
 
   pushFans() {
@@ -127,7 +127,7 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/fan?mid=${userInfo.value.mid}', preventDuplicates: false);
+    Get.toNamed('/fan?mid=${userInfo.value.mid}');
   }
 
   pushDynamic() {
@@ -135,7 +135,6 @@ class MineController extends GetxController {
       SmartDialog.showToast('账号未登录');
       return;
     }
-    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}',
+    Get.toNamed('/memberDynamics?mid=${userInfo.value.mid}');
-        preventDuplicates: false);
   }
 }

lib/pages/preview/view.dart

@@ -102,12 +102,15 @@ class _ImagePreviewState extends State<ImagePreview>
     );
   }
 
-  // 隐藏状态栏，避免遮挡图片内容
+  // 设置状态栏图标透明
   setStatusBar() async {
-    if (Platform.isIOS || Platform.isAndroid) {
+    if (Platform.isIOS) {
       await StatusBarControl.setHidden(true,
           animation: StatusBarAnimation.SLIDE);
     }
+    if (Platform.isAndroid) {
+      await StatusBarControl.setColor(Colors.transparent);
+    }
   }
 
   @override
@@ -135,103 +138,115 @@ class _ImagePreviewState extends State<ImagePreview>
       ),
       body: Stack(
         children: [
-          GestureDetector(
+          DismissiblePage(
-            onLongPress: () => onOpenMenu(),
+            backgroundColor: Colors.transparent,
-            child: ExtendedImageGesturePageView.builder(
+            onDismissed: () {
-              controller: ExtendedPageController(
+              Navigator.of(context).pop();
-                initialPage: _previewController.initialPage.value,
+            },
-                pageSpacing: 0,
+            // Note that scrollable widget inside DismissiblePage might limit the functionality
-              ),
+            // If scroll direction matches DismissiblePage direction
-              onPageChanged: (int index) => _previewController.onChange(index),
+            direction: DismissiblePageDismissDirection.down,
-              canScrollPage: (GestureDetails? gestureDetails) =>
+            disabled: _dismissDisabled,
-                  gestureDetails!.totalScale! <= 1.0,
+            isFullScreen: true,
-              itemCount: widget.imgList!.length,
+            child: GestureDetector(
-              itemBuilder: (BuildContext context, int index) {
+              onLongPress: () => onOpenMenu(),
-                return ExtendedImage.network(
+              child: ExtendedImageGesturePageView.builder(
-                  widget.imgList![index],
+                controller: ExtendedPageController(
-                  fit: BoxFit.contain,
+                  initialPage: _previewController.initialPage.value,
-                  mode: ExtendedImageMode.gesture,
+                  pageSpacing: 0,
-                  onDoubleTap: (ExtendedImageGestureState state) {
+                ),
-                    final Offset? pointerDownPosition =
+                onPageChanged: (int index) =>
-                        state.pointerDownPosition;
+                    _previewController.onChange(index),
-                    final double? begin = state.gestureDetails!.totalScale;
+                canScrollPage: (GestureDetails? gestureDetails) =>
-                    double end;
+                    gestureDetails!.totalScale! <= 1.0,
+                itemCount: widget.imgList!.length,
+                itemBuilder: (BuildContext context, int index) {
+                  return ExtendedImage.network(
+                    widget.imgList![index],
+                    fit: BoxFit.contain,
+                    mode: ExtendedImageMode.gesture,
+                    onDoubleTap: (ExtendedImageGestureState state) {
+                      final Offset? pointerDownPosition =
+                          state.pointerDownPosition;
+                      final double? begin = state.gestureDetails!.totalScale;
+                      double end;
 
-                    //remove old
+                      //remove old
-                    _doubleClickAnimation
+                      _doubleClickAnimation
-                        ?.removeListener(_doubleClickAnimationListener);
+                          ?.removeListener(_doubleClickAnimationListener);
 
-                    //stop pre
+                      //stop pre
-                    _doubleClickAnimationController.stop();
+                      _doubleClickAnimationController.stop();
 
-                    //reset to use
+                      //reset to use
-                    _doubleClickAnimationController.reset();
+                      _doubleClickAnimationController.reset();
 
-                    if (begin == doubleTapScales[0]) {
+                      if (begin == doubleTapScales[0]) {
-                      setState(() {
+                        setState(() {
-                        _dismissDisabled = true;
+                          _dismissDisabled = true;
-                      });
+                        });
-                      end = doubleTapScales[1];
+                        end = doubleTapScales[1];
-                    } else {
+                      } else {
-                      setState(() {
+                        setState(() {
-                        _dismissDisabled = false;
+                          _dismissDisabled = false;
-                      });
+                        });
-                      end = doubleTapScales[0];
+                        end = doubleTapScales[0];
-                    }
+                      }
 
-                    _doubleClickAnimationListener = () {
+                      _doubleClickAnimationListener = () {
-                      state.handleDoubleTap(
+                        state.handleDoubleTap(
-                          scale: _doubleClickAnimation!.value,
+                            scale: _doubleClickAnimation!.value,
-                          doubleTapPosition: pointerDownPosition);
+                            doubleTapPosition: pointerDownPosition);
-                    };
+                      };
-                    _doubleClickAnimation = _doubleClickAnimationController
+                      _doubleClickAnimation = _doubleClickAnimationController
-                        .drive(Tween<double>(begin: begin, end: end));
+                          .drive(Tween<double>(begin: begin, end: end));
 
-                    _doubleClickAnimation!
+                      _doubleClickAnimation!
-                        .addListener(_doubleClickAnimationListener);
+                          .addListener(_doubleClickAnimationListener);
 
-                    _doubleClickAnimationController.forward();
+                      _doubleClickAnimationController.forward();
-                  },
+                    },
-                  // ignore: body_might_complete_normally_nullable
+                    // ignore: body_might_complete_normally_nullable
-                  loadStateChanged: (ExtendedImageState state) {
+                    loadStateChanged: (ExtendedImageState state) {
-                    if (state.extendedImageLoadState == LoadState.loading) {
+                      if (state.extendedImageLoadState == LoadState.loading) {
-                      final ImageChunkEvent? loadingProgress =
+                        final ImageChunkEvent? loadingProgress =
-                          state.loadingProgress;
+                            state.loadingProgress;
-                      final double? progress =
+                        final double? progress =
-                          loadingProgress?.expectedTotalBytes != null
+                            loadingProgress?.expectedTotalBytes != null
-                              ? loadingProgress!.cumulativeBytesLoaded /
+                                ? loadingProgress!.cumulativeBytesLoaded /
-                                  loadingProgress.expectedTotalBytes!
+                                    loadingProgress.expectedTotalBytes!
-                              : null;
+                                : null;
-                      return Center(
+                        return Center(
-                        child: Column(
+                          child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
+                            mainAxisAlignment: MainAxisAlignment.center,
-                          crossAxisAlignment: CrossAxisAlignment.center,
+                            crossAxisAlignment: CrossAxisAlignment.center,
-                          children: <Widget>[
+                            children: <Widget>[
-                            SizedBox(
+                              SizedBox(
-                              width: 150.0,
+                                width: 150.0,
-                              child: LinearProgressIndicator(
+                                child: LinearProgressIndicator(
-                                value: progress,
+                                  value: progress,
-                                color: Colors.white,
+                                  color: Colors.white,
+                                ),
                               ),
-                            ),
+                              // const SizedBox(height: 10.0),
-                            // const SizedBox(height: 10.0),
+                              // Text('${((progress ?? 0.0) * 100).toInt()}%',),
-                            // Text('${((progress ?? 0.0) * 100).toInt()}%',),
+                            ],
-                          ],
+                          ),
-                        ),
+                        );
+                      }
+                    },
+                    initGestureConfigHandler: (ExtendedImageState state) {
+                      return GestureConfig(
+                        inPageView: true,
+                        initialScale: 1.0,
+                        maxScale: 5.0,
+                        animationMaxScale: 6.0,
+                        initialAlignment: InitialAlignment.center,
                       );
-                    }
+                    },
-                  },
+                  );
-                  initGestureConfigHandler: (ExtendedImageState state) {
+                },
-                    return GestureConfig(
+              ),
-                      inPageView: true,
-                      initialScale: 1.0,
-                      maxScale: 5.0,
-                      animationMaxScale: 6.0,
-                      initialAlignment: InitialAlignment.center,
-                    );
-                  },
-                );
-              },
             ),
           ),
           Positioned(
@@ -239,49 +254,33 @@ class _ImagePreviewState extends State<ImagePreview>
             right: 0,
             bottom: 0,
             child: Container(
-                padding: EdgeInsets.only(
+              padding: EdgeInsets.only(
-                    left: 20,
+                  bottom: MediaQuery.of(context).padding.bottom + 30),
-                    right: 20,
+              decoration: const BoxDecoration(
-                    bottom: MediaQuery.of(context).padding.bottom + 30),
+                gradient: LinearGradient(
-                decoration: const BoxDecoration(
+                  begin: Alignment.topCenter,
-                  gradient: LinearGradient(
+                  end: Alignment.bottomCenter,
-                    begin: Alignment.topCenter,
+                  colors: <Color>[
-                    end: Alignment.bottomCenter,
+                    Colors.transparent,
-                    colors: <Color>[
+                    Colors.black87,
-                      Colors.transparent,
-                      Colors.black87,
-                    ],
-                    tileMode: TileMode.mirror,
-                  ),
-                ),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    widget.imgList!.length > 1
-                        ? Obx(
-                            () => Text.rich(
-                              textAlign: TextAlign.center,
-                              TextSpan(
-                                  style: const TextStyle(
-                                      color: Colors.white, fontSize: 16),
-                                  children: [
-                                    TextSpan(
-                                        text: _previewController.currentPage
-                                            .toString()),
-                                    const TextSpan(text: ' / '),
-                                    TextSpan(
-                                        text:
-                                            widget.imgList!.length.toString()),
-                                  ]),
-                            ),
-                          )
-                        : const SizedBox(),
-                    IconButton(
-                      onPressed: () => Get.back(),
-                      icon: const Icon(Icons.close, color: Colors.white),
-                    ),
                   ],
-                )),
+                  tileMode: TileMode.mirror,
+                ),
+              ),
+              child: Obx(
+                () => Text.rich(
+                  textAlign: TextAlign.center,
+                  TextSpan(
+                      style: const TextStyle(color: Colors.white, fontSize: 15),
+                      children: [
+                        TextSpan(
+                            text: _previewController.currentPage.toString()),
+                        const TextSpan(text: ' / '),
+                        TextSpan(text: widget.imgList!.length.toString()),
+                      ]),
+                ),
+              ),
+            ),
           ),
         ],
       ),

lib/pages/rcmd/controller.dart

@@ -9,15 +9,14 @@ import 'package:pilipala/utils/storage.dart';
 class RcmdController extends GetxController {
   final ScrollController scrollController = ScrollController();
   int _currentPage = 0;
-  // RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
+  RxList<RecVideoItemAppModel> appVideoList = <RecVideoItemAppModel>[].obs;
-  // RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
+  RxList<RecVideoItemModel> webVideoList = <RecVideoItemModel>[].obs;
   bool isLoadingMore = true;
   OverlayEntry? popupDialog;
   Box setting = GStrorage.setting;
   RxInt crossAxisCount = 2.obs;
   late bool enableSaveLastData;
   late String defaultRcmdType = 'web';
-  late RxList<dynamic> videoList;
 
   @override
   void onInit() {
@@ -28,58 +27,81 @@ class RcmdController extends GetxController {
         setting.get(SettingBoxKey.enableSaveLastData, defaultValue: false);
     defaultRcmdType =
         setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
-    if (defaultRcmdType == 'web') {
-      videoList = <RecVideoItemModel>[].obs;
-    } else {
-      videoList = <RecVideoItemAppModel>[].obs;
-    }
   }
 
   // 获取推荐
   Future queryRcmdFeed(type) async {
+    print(defaultRcmdType);
+    if (defaultRcmdType == 'app') {
+      return await queryRcmdFeedApp(type);
+    }
+    if (defaultRcmdType == 'web') {
+      return await queryRcmdFeedWeb(type);
+    }
+  }
+
+  // 获取app端推荐
+  Future queryRcmdFeedApp(type) async {
     if (isLoadingMore == false) {
       return;
     }
     if (type == 'onRefresh') {
       _currentPage = 0;
     }
-    late final Map<String, dynamic> res;
+    var res = await VideoHttp.rcmdVideoListApp(
-    switch (defaultRcmdType) {
+      freshIdx: _currentPage,
-      case 'app':
+    );
-      case 'notLogin':
-        res = await VideoHttp.rcmdVideoListApp(
-          loginStatus: defaultRcmdType != 'notLogin',
-          freshIdx: _currentPage,
-        );
-        break;
-      default: //'web'
-        res = await VideoHttp.rcmdVideoList(
-          freshIdx: _currentPage,
-          ps: 20,
-        );
-    }
     if (res['status']) {
       if (type == 'init') {
-        if (videoList.isNotEmpty) {
+        if (appVideoList.isNotEmpty) {
-          videoList.addAll(res['data']);
+          appVideoList.addAll(res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onRefresh') {
         if (enableSaveLastData) {
-          videoList.insertAll(0, res['data']);
+          appVideoList.insertAll(0, res['data']);
         } else {
-          videoList.value = res['data'];
+          appVideoList.value = res['data'];
         }
       } else if (type == 'onLoad') {
-        videoList.addAll(res['data']);
+        appVideoList.addAll(res['data']);
       }
       _currentPage += 1;
-      // 若videoList数量太小，可能会影响翻页，此时再次请求
+    }
-      // 为避免请求到的数据太少时还在反复请求，要求本次返回数据大于1条才触发
+    isLoadingMore = false;
-      if (res['data'].length > 1 && videoList.length < 10) {
+    return res;
-        queryRcmdFeed('onLoad');
+  }
+
+  // 获取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 (webVideoList.isNotEmpty) {
+          webVideoList.addAll(res['data']);
+        } else {
+          webVideoList.value = res['data'];
+        }
+      } else if (type == 'onRefresh') {
+        if (enableSaveLastData) {
+          webVideoList.insertAll(0, res['data']);
+        } else {
+          webVideoList.value = res['data'];
+        }
+      } else if (type == 'onLoad') {
+        webVideoList.addAll(res['data']);
       }
+      _currentPage += 1;
     }
     isLoadingMore = false;
     return res;
@@ -96,7 +118,7 @@ class RcmdController extends GetxController {
     queryRcmdFeed('onLoad');
   }
 
-  // 返回顶部
+  // 返回顶部并刷新
   void animateToTop() async {
     if (scrollController.offset >=
         MediaQuery.of(Get.context!).size.height * 5) {

lib/pages/rcmd/view.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
@@ -44,7 +45,7 @@ class _RcmdPageState extends State<RcmdPage>
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 200) {
           EasyThrottle.throttle(
-              'my-throttler', const Duration(milliseconds: 200), () {
+              'my-throttler', const Duration(milliseconds: 500), () {
             _rcmdController.isLoadingMore = true;
             _rcmdController.onLoad();
           });
@@ -96,24 +97,29 @@ class _RcmdPageState extends State<RcmdPage>
                   if (snapshot.connectionState == ConnectionState.done) {
                     Map data = snapshot.data as Map;
                     if (data['status']) {
-                      return Obx(
+                      return Platform.isAndroid || Platform.isIOS
-                        () {
+                          ? Obx(
-                          if (_rcmdController.isLoadingMore &&
+                              () => contentGrid(
-                              _rcmdController.videoList.isEmpty) {
+                                  _rcmdController,
-                            return contentGrid(_rcmdController, []);
+                                  _rcmdController.defaultRcmdType == 'web'
-                          } else {
+                                      ? _rcmdController.webVideoList
-                            // 显示视频列表
+                                      : _rcmdController.appVideoList),
-                            return contentGrid(
+                            )
-                                _rcmdController, _rcmdController.videoList);
+                          : SliverLayoutBuilder(
-                          }
+                              builder: (context, boxConstraints) {
-                        },
+                              return Obx(
-                      );
+                                () => contentGrid(
+                                    _rcmdController,
+                                    _rcmdController.defaultRcmdType == 'web'
+                                        ? _rcmdController.webVideoList
+                                        : _rcmdController.appVideoList),
+                              );
+                            });
                     } else {
                       return HttpError(
                         errMsg: data['msg'],
                         fn: () {
                           setState(() {
-                            _rcmdController.isLoadingMore = true;
                             _futureBuilderFuture =
                                 _rcmdController.queryRcmdFeed('init');
                           });
@@ -121,11 +127,20 @@ class _RcmdPageState extends State<RcmdPage>
                       );
                     }
                   } else {
+                    // 缓存数据
+                    // if (_rcmdController.videoList.isNotEmpty) {
+                    //   return contentGrid(
+                    //       _rcmdController, _rcmdController.videoList);
+                    // }
+                    // // 骨架屏
+                    // else {
                     return contentGrid(_rcmdController, []);
+                    // }
                   }
                 },
               ),
             ),
+            LoadingMore(ctr: _rcmdController)
           ],
         ),
       ),
@@ -188,3 +203,33 @@ class _RcmdPageState extends State<RcmdPage>
     );
   }
 }
+
+class LoadingMore extends StatelessWidget {
+  final dynamic ctr;
+  const LoadingMore({super.key, this.ctr});
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: Container(
+        height: MediaQuery.of(context).padding.bottom + 80,
+        padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
+        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/controller.dart

@@ -15,7 +15,7 @@ class SSearchController extends GetxController {
   Box histiryWord = GStrorage.historyword;
   List historyCacheList = [];
   RxList historyList = [].obs;
-  RxList<SearchSuggestItem> searchSuggestList = <SearchSuggestItem>[].obs;
+  RxList<SearchSuggestItem> searchSuggestList = [SearchSuggestItem()].obs;
   final _debouncer =
       Debouncer(delay: const Duration(milliseconds: 200)); // 设置延迟时间
   String hintText = '搜索';
@@ -29,7 +29,7 @@ class SSearchController extends GetxController {
     // 其他页面跳转过来
     if (Get.parameters.keys.isNotEmpty) {
       if (Get.parameters['keyword'] != null) {
-        onClickKeyword(Get.parameters['keyword']!);
+        onClickKeyword(Get.parameters['keyword']!, null);
       }
       if (Get.parameters['hintText'] != null) {
         hintText = Get.parameters['hintText']!;
@@ -88,7 +88,12 @@ class SSearchController extends GetxController {
   }
 
   // 点击热搜关键词
-  void onClickKeyword(String keyword) {
+  void onClickKeyword(String keyword, item) {
+    if (item != null && item.wordType == 7) {
+      Get.toNamed('/liveRoom?roomid=${item.liveId.first}',
+          arguments: {'liveItem': null, 'heroTag': '${item.liveId.first}'});
+      return;
+    }
     searchKeyWord.value = keyword;
     controller.value.text = keyword;
     // 移动光标

lib/pages/search/view.dart

@@ -115,8 +115,8 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                   customBorder: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(4),
                   ),
-                  onTap: () => ssCtr
+                  onTap: () => ssCtr.onClickKeyword(
-                      .onClickKeyword(ssCtr.searchSuggestList[index].term!),
+                      ssCtr.searchSuggestList[index].term!, null),
                   child: Padding(
                     padding: const EdgeInsets.only(left: 20, top: 9, bottom: 9),
                     child: ssCtr.searchSuggestList[index].textRich,
@@ -178,34 +178,22 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
                           width: width,
                           // ignore: invalid_use_of_protected_member
                           hotSearchList: _searchController.hotSearchList.value,
-                          onClick: (keyword) async {
+                          onClick: (keyword, item) async {
                             _searchController.searchFocusNode.unfocus();
                             await Future.delayed(
                                 const Duration(milliseconds: 150));
-                            _searchController.onClickKeyword(keyword);
+                            _searchController.onClickKeyword(keyword, item);
                           },
                         ),
                       );
                     } else {
-                      return CustomScrollView(
+                      return HttpError(
-                        slivers: [
+                        errMsg: data['msg'],
-                          HttpError(
+                        fn: () => setState(() {}),
-                            errMsg: data['msg'],
-                            fn: () => setState(() {}),
-                          )
-                        ],
                       );
                     }
                   } else {
-                    // 缓存数据
+                    return const SizedBox();
-                    if (_searchController.hotSearchList.isNotEmpty) {
-                      return HotKeyword(
-                        width: width,
-                        hotSearchList: _searchController.hotSearchList,
-                      );
-                    } else {
-                      return const SizedBox();
-                    }
                   }
                 },
               );

lib/pages/search/widgets/hot_keyword.dart

@@ -26,7 +26,7 @@ class HotKeyword extends StatelessWidget {
               borderRadius: BorderRadius.circular(3),
               clipBehavior: Clip.hardEdge,
               child: InkWell(
-                onTap: () => onClick!(i.keyword),
+                onTap: () => onClick!(i.keyword, i),
                 child: Padding(
                   padding: EdgeInsets.only(
                       left: 2,

lib/pages/search_panel/view.dart

@@ -105,11 +105,7 @@ class _SearchPanelState extends State<SearchPanel>
                   slivers: [
                     HttpError(
                       errMsg: data['msg'],
-                      fn: () {
+                      fn: () => setState(() {}),
-                        setState(() {
-                          _searchPanelController.onSearch();
-                        });
-                      },
                     ),
                   ],
                 );
@@ -120,11 +116,7 @@ class _SearchPanelState extends State<SearchPanel>
                 slivers: [
                   HttpError(
                     errMsg: '没有相关数据',
-                    fn: () {
+                    fn: () => setState(() {}),
-                      setState(() {
-                        _searchPanelController.onSearch();
-                      });
-                    },
                   ),
                 ],
               );

lib/pages/search_panel/widgets/video_panel.dart

@@ -35,7 +35,7 @@ class SearchVideoPanel extends StatelessWidget {
                 padding: index == 0
                     ? const EdgeInsets.only(top: 2)
                     : EdgeInsets.zero,
-                child: VideoCardH(videoItem: i, showPubdate: true),
+                child: VideoCardH(videoItem: i),
               );
             },
           ),
@@ -70,7 +70,7 @@ class SearchVideoPanel extends StatelessWidget {
                               controller.selectedType.value = i['type'];
                               ctr!.order.value =
                                   i['type'].toString().split('.').last;
-                              SmartDialog.showLoading(msg: 'loading');
+                              SmartDialog.showLoading(msg: 'loooad');
                               await ctr!.onRefresh();
                               SmartDialog.dismiss();
                             },
@@ -202,7 +202,7 @@ class VideoPanelController extends GetxController {
                           Get.find<SearchPanelController>(
                               tag: 'video${searchPanelCtr.keyword!}');
                       ctr.duration.value = i['value'];
-                      SmartDialog.showLoading(msg: 'loading');
+                      SmartDialog.showLoading(msg: 'loooad');
                       await ctr.onRefresh();
                       SmartDialog.dismiss();
                     },

lib/pages/setting/controller.dart

@@ -8,7 +8,6 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
 import '../../models/common/dynamic_badge_mode.dart';
-import '../../models/common/nav_bar_config.dart';
 import '../main/index.dart';
 import 'widgets/select_dialog.dart';
 
@@ -24,7 +23,6 @@ class SettingController extends GetxController {
   Rx<ThemeType> themeType = ThemeType.system.obs;
   var userInfo;
   Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
-  RxInt defaultHomePage = 0.obs;
 
   @override
   void onInit() {
@@ -42,8 +40,6 @@ class SettingController extends GetxController {
     dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
         SettingBoxKey.dynamicBadgeMode,
         defaultValue: DynamicBadgeMode.number.code)];
-    defaultHomePage.value =
-        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0);
   }
 
   loginOut() async {
@@ -114,24 +110,4 @@ class SettingController extends GetxController {
       SmartDialog.showToast('设置成功');
     }
   }
-
-  // 设置默认启动页
-  seteDefaultHomePage(BuildContext context) async {
-    int? result = await showDialog(
-      context: context,
-      builder: (context) {
-        return SelectDialog<int>(
-            title: '首页启动页',
-            value: defaultHomePage.value,
-            values: defaultNavigationBars.map((e) {
-              return {'title': e['label'], 'value': e['id']};
-            }).toList());
-      },
-    );
-    if (result != null) {
-      defaultHomePage.value = result;
-      setting.put(SettingBoxKey.defaultHomePage, result);
-      SmartDialog.showToast('设置成功，重启生效');
-    }
-  }
 }

lib/pages/setting/extra_setting.dart

@@ -1,13 +1,13 @@
 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/models/common/dynamics_type.dart';
+import 'package:pilipala/models/common/rcmd_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 '../home/index.dart';
 import 'widgets/switch_item.dart';
 
 class ExtraSetting extends StatefulWidget {
@@ -20,23 +20,26 @@ class ExtraSetting extends StatefulWidget {
 class _ExtraSettingState extends State<ExtraSetting> {
   Box setting = GStrorage.setting;
   static Box localCache = GStrorage.localCache;
+  late dynamic defaultRcmdType;
   late dynamic defaultReplySort;
   late dynamic defaultDynamicType;
   late dynamic enableSystemProxy;
   late String defaultSystemProxyHost;
   late String defaultSystemProxyPort;
+  Box userInfoCache = GStrorage.userInfo;
+  var userInfo;
   bool userLogin = false;
+  var accessKeyInfo;
 
   @override
   void initState() {
     super.initState();
+    // 首页默认推荐类型
+    defaultRcmdType =
+        setting.get(SettingBoxKey.defaultRcmdType, defaultValue: 'web');
     // 默认优先显示最新评论
     defaultReplySort =
         setting.get(SettingBoxKey.replySortType, defaultValue: 0);
-    if (defaultReplySort == 2) {
-      setting.put(SettingBoxKey.replySortType, 0);
-      defaultReplySort = 0;
-    }
     // 优先展示全部动态 all
     defaultDynamicType =
         setting.get(SettingBoxKey.defaultDynamicType, defaultValue: 0);
@@ -46,6 +49,9 @@ class _ExtraSettingState extends State<ExtraSetting> {
         localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
     defaultSystemProxyPort =
         localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');
+    userInfo = userInfoCache.get('userInfoCache');
+    userLogin = userInfo != null;
+    accessKeyInfo = localCache.get(LocalCacheKey.accessKey, defaultValue: null);
   }
 
   // 设置代理
@@ -140,20 +146,24 @@ class _ExtraSettingState extends State<ExtraSetting> {
       ),
       body: ListView(
         children: [
-          const SetSwitchItem(
+          SetSwitchItem(
             title: '大家都在搜',
             subTitle: '是否展示「大家都在搜」',
             setKey: SettingBoxKey.enableHotKey,
             defaultVal: true,
+            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
           ),
-          SetSwitchItem(
+          const SetSwitchItem(
             title: '搜索默认词',
             subTitle: '是否展示搜索框默认词',
             setKey: SettingBoxKey.enableSearchWord,
             defaultVal: true,
-            callFn: (val) {
+          ),
-              Get.find<HomeController>().defaultSearch.value = '';
+          const SetSwitchItem(
-            },
+            title: '推荐动态',
+            subTitle: '是否在推荐内容中展示动态',
+            setKey: SettingBoxKey.enableRcmdDynamic,
+            defaultVal: true,
           ),
           const SetSwitchItem(
             title: '快速收藏',
@@ -167,6 +177,50 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableWordRe,
             defaultVal: false,
           ),
+          const SetSwitchItem(
+            title: '首页推荐刷新',
+            subTitle: '下拉刷新时保留上次内容',
+            setKey: SettingBoxKey.enableSaveLastData,
+            defaultVal: false,
+          ),
+          ListTile(
+            dense: false,
+            title: Text('首页推荐类型', style: titleStyle),
+            subtitle: Text(
+              '当前使用「$defaultRcmdType端」推荐',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                    title: '推荐类型',
+                    value: defaultRcmdType,
+                    values: RcmdType.values.map((e) {
+                      return {'title': e.labels, 'value': e.values};
+                    }).toList(),
+                  );
+                },
+              );
+              if (result != null) {
+                if (result == 'app') {
+                  // app端推荐需要access_key
+                  if (accessKeyInfo == null) {
+                    if (!userLogin) {
+                      SmartDialog.showToast('请先登录');
+                      return;
+                    }
+                    await MemberHttp.cookieToKey();
+                  }
+                }
+                defaultRcmdType = result;
+                setting.put(SettingBoxKey.defaultRcmdType, result);
+                SmartDialog.showToast('下次启动时生效');
+                setState(() {});
+              }
+            },
+          ),
           const SetSwitchItem(
             title: '启用ai总结',
             subTitle: '视频详情页开启ai总结',

lib/pages/setting/pages/home_tabbar_set.dart

@@ -40,6 +40,10 @@ class _TabbarSetPageState extends State<TabbarSetPage> {
         .where((i) => tabbarSort.contains((i['type'] as TabType).id))
         .map<String>((i) => (i['type'] as TabType).id)
         .toList();
+    if (sortedTabbar.isEmpty) {
+      SmartDialog.showToast('请至少设置一项！');
+      return;
+    }
     settingStorage.put(SettingBoxKey.tabbarSort, sortedTabbar);
     SmartDialog.showToast('保存成功，下次启动时生效');
   }

lib/pages/setting/pages/play_gesture_set.dart

@@ -1,88 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hive/hive.dart';
-import 'package:pilipala/utils/global_data.dart';
-
-import '../../../models/common/gesture_mode.dart';
-import '../../../utils/storage.dart';
-import '../widgets/select_dialog.dart';
-import '../widgets/switch_item.dart';
-
-class PlayGesturePage extends StatefulWidget {
-  const PlayGesturePage({super.key});
-
-  @override
-  State<PlayGesturePage> createState() => _PlayGesturePageState();
-}
-
-class _PlayGesturePageState extends State<PlayGesturePage> {
-  Box setting = GStrorage.setting;
-  late int fullScreenGestureMode;
-
-  @override
-  void initState() {
-    super.initState();
-    fullScreenGestureMode = setting.get(SettingBoxKey.fullScreenGestureMode,
-        defaultValue: FullScreenGestureMode.values.last.index);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
-    TextStyle subTitleStyle = Theme.of(context)
-        .textTheme
-        .labelMedium!
-        .copyWith(color: Theme.of(context).colorScheme.outline);
-    return Scaffold(
-      appBar: AppBar(
-        centerTitle: false,
-        titleSpacing: 0,
-        title: Text(
-          '手势设置',
-          style: Theme.of(context).textTheme.titleMedium,
-        ),
-      ),
-      body: ListView(
-        children: [
-          ListTile(
-            dense: false,
-            title: Text('全屏手势', style: titleStyle),
-            subtitle: Text(
-              '通过手势快速进入全屏',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              String? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<String>(
-                      title: '全屏手势',
-                      value: FullScreenGestureMode
-                          .values[fullScreenGestureMode].values,
-                      values: FullScreenGestureMode.values.map((e) {
-                        return {'title': e.labels, 'value': e.values};
-                      }).toList());
-                },
-              );
-              if (result != null) {
-                GlobalData().fullScreenGestureMode = FullScreenGestureMode
-                    .values
-                    .firstWhere((element) => element.values == result);
-                fullScreenGestureMode =
-                    GlobalData().fullScreenGestureMode.index;
-                setting.put(
-                    SettingBoxKey.fullScreenGestureMode, fullScreenGestureMode);
-                setState(() {});
-              }
-            },
-          ),
-          const SetSwitchItem(
-            title: '双击快退/快进',
-            subTitle: '左侧双击快退，右侧双击快进',
-            setKey: SettingBoxKey.enableQuickDouble,
-            defaultVal: true,
-          ),
-        ],
-      ),
-    );
-  }
-}