Merge branch 'design'

2024-11-18 11:05:25 +08:00
parent dc9bdcb917 d6247fad98
commit 3fda360739
27 changed files with 164 additions and 98 deletions
--- a/lib/http/init.dart
+++ b/lib/http/init.dart
@ -9,6 +9,7 @@ import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import '../utils/storage.dart';
 import '../utils/utils.dart';
@ -43,7 +44,7 @@ class Request {
    dio.interceptors.add(cookieManager);
    final List<Cookie> cookie = await cookieManager.cookieJar
        .loadForRequest(Uri.parse(HttpString.baseUrl));
-    final userInfo = userInfoCache.get('userInfoCache');
+    final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
    if (userInfo != null && userInfo.mid != null) {
      final List<Cookie> cookie2 = await cookieManager.cookieJar
          .loadForRequest(Uri.parse(HttpString.tUrl));
--- a/lib/http/member.dart
+++ b/lib/http/member.dart
@ -4,6 +4,7 @@ import 'package:hive/hive.dart';
 import 'package:html/parser.dart';
 import 'package:pilipala/models/member/article.dart';
 import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/global_data_cache.dart';
 import '../common/constants.dart';
 import '../models/dynamics/result.dart';
@ -472,9 +473,9 @@ class MemberHttp {
      String accessKey = res.data['data']['access_token'];
      Box localCache = GStorage.localCache;
      Box userInfoCache = GStorage.userInfo;
-      var userInfo = userInfoCache.get('userInfoCache');
+      final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
      localCache.put(
-          LocalCacheKey.accessKey, {'mid': userInfo.mid, 'value': accessKey});
+          LocalCacheKey.accessKey, {'mid': userInfo!.mid, 'value': accessKey});
      return {'status': true, 'data': [], 'msg': '操作成功'};
    } else {
      return {
--- a/lib/main.dart
+++ b/lib/main.dart
@ -224,12 +224,8 @@ class BuildMainApp extends StatelessWidget {

    AppBarTheme appBarTheme(ColorScheme colorScheme) {
      return AppBarTheme(
-        backgroundColor: currentThemeValue == ThemeType.dark
-            ? darkColorScheme.surface
-            : lightColorScheme.surface,
-        foregroundColor: currentThemeValue == ThemeType.dark
-            ? darkColorScheme.onSurface
-            : lightColorScheme.onSurface,
+        backgroundColor: colorScheme.surface,
+        foregroundColor: colorScheme.onSurface,
        elevation: 0,
        titleSpacing: 0,
        scrolledUnderElevation: 0,
--- a/lib/pages/bangumi/controller.dart
+++ b/lib/pages/bangumi/controller.dart
@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/bangumi.dart';
 import 'package:pilipala/models/bangumi/list.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 class BangumiController extends GetxController {
@ -15,14 +16,14 @@ class BangumiController extends GetxController {
  Box userInfoCache = GStorage.userInfo;
  RxBool userLogin = false.obs;
  late int mid;
-  var userInfo;
+  UserInfoData? userInfo;

  @override
  void onInit() {
    super.onInit();
    userInfo = userInfoCache.get('userInfoCache');
    if (userInfo != null) {
-      mid = userInfo.mid;
+      mid = userInfo!.mid!;
    }
    userLogin.value = userInfo != null;
  }
@ -55,7 +56,7 @@ class BangumiController extends GetxController {
    if (userInfo == null) {
      return;
    }
-    var result = await BangumiHttp.getRecentBangumi(mid: userInfo.mid);
+    var result = await BangumiHttp.getRecentBangumi(mid: userInfo!.mid!);
    if (result['status']) {
      bangumiFollowList.value = result['data'].list;
      total.value = result['data'].total;
--- a/lib/pages/bangumi/introduction/controller.dart
+++ b/lib/pages/bangumi/introduction/controller.dart
@ -8,6 +8,7 @@ import 'package:pilipala/http/search.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/reply/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
@ -57,7 +58,7 @@ class BangumiIntroController extends GetxController {
  RxBool isFollowed = false.obs;
  RxInt followStatus = 1.obs;
  int _tempThemeValue = -1;
-  var userInfo;
+  UserInfoData? userInfo;
  PersistentBottomSheetController? bottomSheetController;
  List<Map<String, dynamic>> followStatusList = [
    {'title': '标记为 「想看」', 'status': 1},
@ -259,7 +260,7 @@ class BangumiIntroController extends GetxController {

  Future queryVideoInFolder() async {
    var result = await VideoHttp.videoInFolder(
-        mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
+        mid: userInfo!.mid!, rid: IdUtils.bv2av(bvid));
    if (result['status']) {
      favFolderData.value = result['data'];
    }
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@ -148,7 +148,7 @@ class _BangumiInfoState extends State<BangumiInfo> {

  // 收藏
  showFavBottomSheet() async {
-    if (bangumiIntroController.userInfo.mid == null) {
+    if (bangumiIntroController.userInfo?.mid == null) {
      SmartDialog.showToast('账号未登录');
      return;
    }
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@ -5,6 +5,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/bangumi/info.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import '../../../common/pages_bottom_sheet.dart';
@ -37,7 +38,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
  late RxInt currentIndex = (-1).obs;
  final ScrollController listViewScrollCtr = ScrollController();
  Box userInfoCache = GStorage.userInfo;
-  dynamic userInfo;
+  UserInfoData? userInfo;
  // 默认未开通
  int vipStatus = 0;
  late int cid;
@ -63,7 +64,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
    /// 获取大会员状态
    userInfo = userInfoCache.get('userInfoCache');
    if (userInfo != null) {
-      vipStatus = userInfo.vipStatus;
+      vipStatus = userInfo!.vipStatus!;
    }
  }

--- a/lib/pages/dynamics/controller.dart
+++ b/lib/pages/dynamics/controller.dart
@ -10,6 +10,7 @@ import 'package:pilipala/models/common/dynamics_type.dart';
 import 'package:pilipala/models/dynamics/result.dart';
 import 'package:pilipala/models/dynamics/up.dart';
 import 'package:pilipala/models/live/item.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 import 'package:pilipala/utils/route_push.dart';
@ -52,7 +53,7 @@ class DynamicsController extends GetxController {
  RxInt initialValue = 0.obs;
  Box userInfoCache = GStorage.userInfo;
  RxBool userLogin = false.obs;
-  var userInfo;
+  UserInfoData? userInfo;
  RxBool isLoadingDynamic = false.obs;
  Box setting = GStorage.setting;

@ -246,7 +247,7 @@ class DynamicsController extends GetxController {
      }
      upData.value.upList!.insertAll(0, [
        UpItem(face: '', uname: '全部动态', mid: -1),
-        UpItem(face: userInfo.face, uname: '我', mid: userInfo.mid),
+        UpItem(face: userInfo!.face, uname: '我', mid: userInfo!.mid),
      ]);
    }
    return res;
--- a/lib/pages/dynamics/widgets/action_panel.dart
+++ b/lib/pages/dynamics/widgets/action_panel.dart
@ -90,7 +90,7 @@ class _ActionPanelState extends State<ActionPanel>
      SmartDialog.showToast('请先登录');
      return;
    }
-    int mid = userInfo.mid;
+    int mid = userInfo.mid!;
    showModalBottomSheet(
      context: context,
      enableDrag: true,
--- a/lib/pages/fan/controller.dart
+++ b/lib/pages/fan/controller.dart
@ -3,6 +3,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/fan.dart';
 import 'package:pilipala/models/fans/result.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 class FansController extends GetxController {
@ -13,7 +14,7 @@ class FansController extends GetxController {
  RxList<FansItemModel> fansList = <FansItemModel>[].obs;
  late int mid;
  late String name;
-  var userInfo;
+  UserInfoData? userInfo;
  RxString loadingText = '加载中...'.obs;
  RxBool isOwner = false.obs;

@ -23,9 +24,9 @@ class FansController extends GetxController {
    userInfo = userInfoCache.get('userInfoCache');
    mid = Get.parameters['mid'] != null
        ? int.parse(Get.parameters['mid']!)
-        : userInfo.mid;
-    isOwner.value = mid == userInfo.mid;
-    name = Get.parameters['name'] ?? userInfo.uname;
+        : userInfo!.mid!;
+    isOwner.value = mid == userInfo?.mid;
+    name = Get.parameters['name'] ?? userInfo?.uname ?? '';
  }

  Future queryFans(type) async {
--- a/lib/pages/follow/controller.dart
+++ b/lib/pages/follow/controller.dart
@ -6,6 +6,7 @@ import 'package:pilipala/http/follow.dart';
 import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/follow/result.dart';
 import 'package:pilipala/models/member/tags.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 /// 查看自己的关注时，可以查看分类
@ -18,7 +19,7 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
  RxList<FollowItemModel> followList = <FollowItemModel>[].obs;
  late int mid;
  late String name;
-  var userInfo;
+  UserInfoData? userInfo;
  RxString loadingText = '加载中...'.obs;
  RxBool isOwner = false.obs;
  late List<MemberTagItemModel> followTags;
@ -30,9 +31,9 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {
    userInfo = userInfoCache.get('userInfoCache');
    mid = Get.parameters['mid'] != null
        ? int.parse(Get.parameters['mid']!)
-        : userInfo.mid;
-    isOwner.value = mid == userInfo.mid;
-    name = Get.parameters['name'] ?? userInfo.uname;
+        : userInfo!.mid!;
+    isOwner.value = mid == userInfo?.mid;
+    name = Get.parameters['name'] ?? userInfo?.uname ?? '';
  }

  Future queryFollowings(type) async {
@ -68,7 +69,7 @@ class FollowController extends GetxController with GetTickerProviderStateMixin {

  // 当查看当前用户的关注时，请求关注分组
  Future followUpTags() async {
-    if (userInfo != null && mid == userInfo.mid) {
+    if (userInfo != null && mid == userInfo!.mid) {
      var res = await MemberHttp.followUpTags();
      if (res['status']) {
        followTags = res['data'];
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/tab_type.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
 import '../../http/index.dart';

@ -18,7 +19,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
  Box settingStorage = GStorage.setting;
  RxBool userLogin = false.obs;
  RxString userFace = ''.obs;
-  var userInfo;
+  UserInfoData? userInfo;
  Box setting = GStorage.setting;
  late final StreamController<bool> searchBarStream =
      StreamController<bool>.broadcast();
@ -33,7 +34,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    super.onInit();
    userInfo = userInfoCache.get('userInfoCache');
    userLogin.value = userInfo != null;
-    userFace.value = userInfo != null ? userInfo.face : '';
+    userFace.value = userInfo != null ? userInfo!.face! : '';
    hideSearchBar =
        setting.get(SettingBoxKey.hideSearchBar, defaultValue: false);
    if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
@ -62,7 +63,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    userInfo = await userInfoCache.get('userInfoCache');
    userLogin.value = val ?? false;
    if (val) return;
-    userFace.value = userInfo != null ? userInfo.face : '';
+    userFace.value = userInfo != null ? userInfo!.face! : '';
  }

  void setTabConfig() async {
--- a/lib/pages/home/widgets/app_bar.dart
+++ b/lib/pages/home/widgets/app_bar.dart
@ -3,6 +3,7 @@ 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/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 Box userInfoCache = GStorage.userInfo;
@ -12,7 +13,7 @@ class HomeAppBar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    var userInfo = userInfoCache.get('userInfoCache');
+    final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
    return SliverAppBar(
      // forceElevated: true,
      scrolledUnderElevation: 0,
--- a/lib/pages/main/controller.dart
+++ b/lib/pages/main/controller.dart
@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/common.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../models/common/dynamic_badge_mode.dart';
@ -26,7 +27,7 @@ class MainController extends GetxController {
  late PageController pageController;
  int selectedIndex = 0;
  Box userInfoCache = GStorage.userInfo;
-  dynamic userInfo;
+  UserInfoData? userInfo;
  RxBool userLogin = false.obs;
  late Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
  late bool enableGradientBg;
@ -85,7 +86,7 @@ class MainController extends GetxController {
    }
    if (mineItemIndex != -1 && userInfo != null) {
      Widget avatar = NetworkImgLayer(
-          width: 28, height: 28, src: userInfo.face, type: 'avatar');
+          width: 28, height: 28, src: userInfo!.face, type: 'avatar');
      navigationBars[mineItemIndex]['icon'] = avatar;
      navigationBars[mineItemIndex]['selectIcon'] = avatar;
    }
--- a/lib/pages/member/controller.dart
+++ b/lib/pages/member/controller.dart
@ -9,6 +9,7 @@ import 'package:pilipala/models/member/archive.dart';
 import 'package:pilipala/models/member/coin.dart';
 import 'package:pilipala/models/member/info.dart';
 import 'package:pilipala/models/member/like.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:share_plus/share_plus.dart';

@ -22,7 +23,7 @@ class MemberController extends GetxController {
  late int ownerMid;
  // 投稿列表
  RxList<VListItemModel>? archiveList = <VListItemModel>[].obs;
-  dynamic userInfo;
+  UserInfoData? userInfo;
  RxInt attribute = (-1).obs;
  RxString attributeText = '关注'.obs;
  RxList<MemberCoinsDataModel> recentCoinsList = <MemberCoinsDataModel>[].obs;
@ -34,7 +35,7 @@ class MemberController extends GetxController {
    super.onInit();
    mid = int.tryParse(Get.parameters['mid']!) ?? -2;
    userInfo = userInfoCache.get('userInfoCache');
-    ownerMid = userInfo != null ? userInfo.mid : -1;
+    ownerMid = userInfo != null ? userInfo!.mid! : -1;
    isOwner.value = mid == ownerMid;
    face.value = Get.arguments['face'] ?? '';
    heroTag = Get.arguments['heroTag'] ?? '';
--- a/lib/pages/member_seasons/controller.dart
+++ b/lib/pages/member_seasons/controller.dart
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/member/seasons.dart';
+import 'package:pilipala/utils/global_data_cache.dart';

 class MemberSeasonsController extends GetxController {
  final ScrollController scrollController = ScrollController();
@ -58,7 +59,7 @@ class MemberSeasonsController extends GetxController {
      mid: mid,
      seriesId: seriesId!,
      pn: pn,
-      currentMid: 17340771,
+      currentMid: GlobalDataCache().userInfo?.mid ?? -1,
    );
    if (res['status']) {
      seasonsList.addAll(res['data'].seriesList);
--- a/lib/pages/member_seasons/view.dart
+++ b/lib/pages/member_seasons/view.dart
@ -2,6 +2,8 @@ import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
+import 'package:pilipala/common/skeleton/video_card_h.dart';
+import 'package:pilipala/common/widgets/http_error.dart';
 import 'controller.dart';
 import 'widgets/item.dart';

@ -54,9 +56,9 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
            builder: (context, snapshot) {
              if (snapshot.connectionState == ConnectionState.done) {
                if (snapshot.data != null) {
-                  Map data = snapshot.data as Map;
+                  Map? data = snapshot.data;
                  List list = _memberSeasonsController.seasonsList;
-                  if (data['status']) {
+                  if (data?['status']) {
                    return Obx(
                      () => list.isNotEmpty
                          ? LayoutBuilder(
@ -82,16 +84,44 @@ class _MemberSeasonsPageState extends State<MemberSeasonsPage> {
                                );
                              },
                            )
-                          : const SizedBox(),
+                          : const HttpError(
+                              errMsg: '没有数据',
+                              isInSliver: false,
+                              isShowBtn: false,
+                            ),
                    );
                  } else {
-                    return const SizedBox();
+                    return HttpError(
+                      errMsg: snapshot.data['msg'],
+                      isInSliver: false,
+                      fn: () {
+                        setState(() {
+                          _futureBuilderFuture =
+                              _memberSeasonsController.onRefresh();
+                        });
+                      },
+                    );
                  }
                } else {
-                  return const SizedBox();
+                  return HttpError(
+                    errMsg: snapshot.data['msg'] ?? '请求异常',
+                    isInSliver: false,
+                    fn: () {
+                      setState(() {
+                        _futureBuilderFuture =
+                            _memberSeasonsController.onRefresh();
+                      });
+                    },
+                  );
                }
              } else {
-                return const SizedBox();
+                return ListView.builder(
+                  itemCount: 10,
+                  shrinkWrap: true,
+                  itemBuilder: (context, index) {
+                    return const VideoCardHSkeleton();
+                  },
+                );
              }
            },
          ),
--- a/lib/pages/mine_edit/controller.dart
+++ b/lib/pages/mine_edit/controller.dart
@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/user.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 class MineEditController extends GetxController {
@ -13,7 +14,7 @@ class MineEditController extends GetxController {
  final TextEditingController signCtr = TextEditingController();
  final TextEditingController birthdayCtr = TextEditingController();
  String? sex;
-  dynamic userInfo;
+  UserInfoData? userInfo;

  @override
  void onInit() {
--- a/lib/pages/setting/controller.dart
+++ b/lib/pages/setting/controller.dart
@ -2,8 +2,8 @@ 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/init.dart';
 import 'package:pilipala/models/common/theme_type.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
@ -22,7 +22,7 @@ class SettingController extends GetxController {
  RxDouble toastOpacity = (1.0).obs;
  RxInt picQuality = 10.obs;
  Rx<ThemeType> themeType = ThemeType.system.obs;
-  var userInfo;
+  UserInfoData? userInfo;
  Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
  RxInt defaultHomePage = 0.obs;

--- a/lib/pages/setting/privacy_setting.dart
+++ b/lib/pages/setting/privacy_setting.dart
@ -3,6 +3,7 @@ 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/user/info.dart';
 import 'package:pilipala/utils/storage.dart';

 class PrivacySetting extends StatefulWidget {
@ -15,7 +16,7 @@ class PrivacySetting extends StatefulWidget {
 class _PrivacySettingState extends State<PrivacySetting> {
  bool userLogin = false;
  Box userInfoCache = GStorage.userInfo;
-  var userInfo;
+  UserInfoData? userInfo;

  @override
  void initState() {
--- a/lib/pages/setting/recommend_setting.dart
+++ b/lib/pages/setting/recommend_setting.dart
@ -3,6 +3,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/member.dart';
 import 'package:pilipala/models/common/rcmd_type.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/recommend_filter.dart';
 import 'package:pilipala/utils/storage.dart';
@ -21,7 +22,7 @@ class _RecommendSettingState extends State<RecommendSetting> {
  static Box localCache = GStorage.localCache;
  late dynamic defaultRcmdType;
  Box userInfoCache = GStorage.userInfo;
-  late dynamic userInfo;
+  UserInfoData? userInfo;
  bool userLogin = false;
  late dynamic accessKeyInfo;
  // late int filterUnfollowedRatio;
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -14,6 +14,7 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/sponsor_block/segment.dart';
 import 'package:pilipala/models/sponsor_block/segment_type.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/video/later.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/models/video/play/url.dart';
@ -94,7 +95,7 @@ class VideoDetailController extends GetxController
  double? brightness;
  // 默认记录历史记录
  bool enableHeart = true;
-  var userInfo;
+  UserInfoData? userInfo;
  late bool isFirstTime = true;
  Floating? floating;
  late PreferredSizeWidget headerControl;
@ -125,6 +126,8 @@ class VideoDetailController extends GetxController
  RxInt watchLaterCount = 0.obs;
  List<SegmentDataModel> skipSegments = <SegmentDataModel>[];
  int? lastPosition;
+  // 默认屏幕方向
+  RxString videoDirection = 'horizontal'.obs;

  @override
  void onInit() {
@ -283,6 +286,10 @@ class VideoDetailController extends GetxController
    } else {
      ScreenBrightness().resetScreenBrightness();
    }
+    videoDirection.value = (firstVideo.width != null &&
+            firstVideo.height != null)
+        ? (firstVideo.width! > firstVideo.height! ? 'horizontal' : 'vertical')
+        : 'horizontal';
    await plPlayerController.setDataSource(
      DataSource(
        videoSource: video ?? videoUrl,
@ -299,11 +306,7 @@ class VideoDetailController extends GetxController
      seekTo: seekToTime ?? defaultST,
      duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
      // 宽>高 水平 否则 垂直
-      direction: firstVideo.width != null && firstVideo.height != null
-          ? ((firstVideo.width! - firstVideo.height!) > 0
-              ? 'horizontal'
-              : 'vertical')
-          : null,
+      direction: videoDirection.value,
      bvid: bvid,
      cid: cid.value,
      enableHeart: enableHeart,
@ -615,7 +618,7 @@ class VideoDetailController extends GetxController
    var count = argMap['count'];
    var res = await UserHttp.getMediaList(
      type: 2,
-      bizId: userInfo.mid,
+      bizId: userInfo!.mid!,
      ps: count,
    );
    if (res['status']) {
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@ -9,6 +9,7 @@ import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/video/ai.dart';
 import 'package:pilipala/models/video/tags.dart';
 import 'package:pilipala/models/video_detail_res.dart';
@ -49,10 +50,8 @@ class VideoIntroController extends GetxController {
  List delMediaIdsNew = [];
  // 关注状态 默认未关注
  RxMap followStatus = {}.obs;
-  int _tempThemeValue = -1;
-
  RxInt lastPlayCid = 0.obs;
-  var userInfo;
+  UserInfoData? userInfo;
  RxList<VideoTagItem> videoTags = <VideoTagItem>[].obs;

  // 同时观看
@ -301,7 +300,7 @@ class VideoIntroController extends GetxController {

  Future queryVideoInFolder() async {
    var result = await VideoHttp.videoInFolder(
-        mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
+        mid: userInfo!.mid!, rid: IdUtils.bv2av(bvid));
    if (result['status']) {
      favFolderData.value = result['data'];
    }
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -123,14 +123,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  // 流
  appbarStreamListen() {
    appbarStream = StreamController<double>.broadcast();
-    _extendNestCtr.addListener(
-      () {
-        final double offset = _extendNestCtr.position.pixels;
-        vdCtr.sheetHeight.value =
-            Get.size.height - videoHeight - statusBarHeight + offset;
-        appbarStream.add(offset);
-      },
-    );
+    _extendNestCtr.addListener(_extendNestCtrListener);
  }

  // 播放器状态监听
@ -225,6 +218,20 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    statusHeight = await StatusBarControl.getHeight;
  }

+  // _extendNestCtr监听
+  void _extendNestCtrListener() {
+    final double offset = _extendNestCtr.position.pixels;
+    if (vdCtr.videoDirection.value == 'horizontal') {
+      vdCtr.sheetHeight.value =
+          Get.size.height - videoHeight - statusBarHeight + offset;
+      appbarStream.add(offset);
+    } else {
+      if (offset > (Get.size.width * 22 / 16 - videoHeight)) {
+        appbarStream.add(offset - (Get.size.width * 22 / 16 - videoHeight));
+      }
+    }
+  }
+
  @override
  void dispose() {
    shutdownTimerService.handleWaitingFinished();
@ -243,6 +250,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    appbarStream.close();
    WidgetsBinding.instance.removeObserver(this);
    _lifecycleListener.dispose();
+    _extendNestCtr.removeListener(_extendNestCtrListener);
    super.dispose();
  }

@ -494,11 +502,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  Widget build(BuildContext context) {
    final sizeContext = MediaQuery.sizeOf(context);
    final _context = MediaQuery.of(context);
-    late double defaultVideoHeight = sizeContext.width * 9 / 16;
+    late final double verticalHeight = sizeContext.width * 22 / 16;
+    late double defaultVideoHeight = vdCtr.videoDirection.value == 'vertical'
+        ? verticalHeight
+        : sizeContext.width * 9 / 16;
    late RxDouble videoHeight = defaultVideoHeight.obs;
    final double pinnedHeaderHeight =
        statusBarHeight + kToolbarHeight + videoHeight.value;
-    // ignore: no_leading_underscores_for_local_identifiers
+    vdCtr.videoDirection.listen((p0) {
+      if (p0 == 'vertical') {
+        videoHeight.value = defaultVideoHeight = verticalHeight;
+      }
+    });

    // 竖屏
    final bool isPortrait = _context.orientation == Orientation.portrait;
@ -541,10 +556,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              showEposideCb: () => vdCtr.videoType == SearchType.video
                  ? videoIntroController.showEposideHandler()
                  : bangumiIntroController.showEposideHandler(),
-              fullScreenCb: (bool status) {
-                videoHeight.value =
-                    status ? Get.size.height : defaultVideoHeight;
-              },
            ));
    }

@ -594,6 +605,28 @@ class _VideoDetailPageState extends State<VideoDetailPage>
      );
    }

+    Widget buildAppBar(BuildContext context, AsyncSnapshot<num> snapshot) {
+      final double distance =
+          statusBarHeight + MediaQuery.of(context).padding.top;
+      return AppBar(
+        backgroundColor: Colors.black,
+        systemOverlayStyle: Platform.isAndroid
+            ? SystemUiOverlayStyle(
+                statusBarIconBrightness:
+                    Theme.of(context).brightness == Brightness.dark
+                        ? Brightness.light
+                        : (snapshot.data! > distance
+                            ? Brightness.dark
+                            : Brightness.light),
+              )
+            : Theme.of(context).brightness == Brightness.dark
+                ? SystemUiOverlayStyle.light
+                : (snapshot.data! > distance
+                    ? SystemUiOverlayStyle.dark
+                    : SystemUiOverlayStyle.light),
+      );
+    }
+
    Widget childWhenDisabled = SafeArea(
      top: MediaQuery.of(context).orientation == Orientation.portrait &&
          plPlayerController?.isFullScreen.value == true,
@ -611,11 +644,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              child: StreamBuilder(
                stream: appbarStream.stream.distinct(),
                initialData: 0,
-                builder: ((context, snapshot) {
-                  return AppBar(
-                    backgroundColor: Colors.black,
-                  );
-                }),
+                builder: buildAppBar,
              ),
            ),
            body: ExtendedNestedScrollView(
@ -773,7 +802,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
            builder: ((context, snapshot) {
              return ScrollAppBar(
                snapshot.data!.toDouble(),
-                () => continuePlay(),
+                continuePlay,
                playerStatus.value,
                null,
              );
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@ -34,21 +34,16 @@ class ScrollAppBar extends StatelessWidget {
          child: AppBar(
            primary: false,
            centerTitle: true,
-            title: TextButton(
+            title: TextButton.icon(
              onPressed: () => callback(),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  const Icon(Icons.play_arrow_rounded),
-                  Text(
-                    playerStatus == PlayerStatus.paused
-                        ? '继续播放'
-                        : playerStatus == PlayerStatus.completed
-                            ? '重新播放'
-                            : '播放中',
-                  )
-                ],
+              label: Text(
+                playerStatus == PlayerStatus.paused
+                    ? '继续播放'
+                    : playerStatus == PlayerStatus.completed
+                        ? '重新播放'
+                        : '播放中',
              ),
+              icon: const Icon(Icons.play_arrow_rounded),
            ),
            // actions: [
            //   IconButton(
--- a/lib/pages/whisper_detail/controller.dart
+++ b/lib/pages/whisper_detail/controller.dart
@ -6,6 +6,7 @@ import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/msg.dart';
 import 'package:pilipala/models/msg/session.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/pages/whisper/index.dart';
 import '../../utils/feed_back.dart';
 import '../../utils/storage.dart';
@ -80,7 +81,7 @@ class WhisperDetailController extends GetxController {
  Future sendMsg() async {
    feedBack();
    String message = replyContentController.text;
-    final userInfo = userInfoCache.get('userInfoCache');
+    final UserInfoData? userInfo = userInfoCache.get('userInfoCache');
    if (userInfo == null) {
      SmartDialog.showToast('请先登录');
      return;
@ -90,7 +91,7 @@ class WhisperDetailController extends GetxController {
      return;
    }
    var result = await MsgHttp.sendMsg(
-      senderUid: userInfo.mid,
+      senderUid: userInfo.mid!,
      receiverId: int.parse(mid),
      content: {'content': message},
      msgType: 1,
--- a/lib/pages/whisper_detail/view.dart
+++ b/lib/pages/whisper_detail/view.dart
@ -2,14 +2,12 @@ import 'dart:async';
 import 'dart:math';
 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/video/reply/emote.dart';
 import 'package:pilipala/pages/emote/index.dart';
 import 'package:pilipala/pages/video/detail/reply_new/toolbar_icon_button.dart';
 import 'package:pilipala/pages/whisper_detail/controller.dart';
 import 'package:pilipala/utils/feed_back.dart';
-import '../../utils/storage.dart';
 import 'widget/chat_item.dart';

 class WhisperDetailPage extends StatefulWidget {
@ -30,7 +28,6 @@ class _WhisperDetailPageState extends State<WhisperDetailPage>
  late double emoteHeight = 230.0;
  double keyboardHeight = 0.0; // 键盘高度
  RxString toolbarType = ''.obs;
-  Box userInfoCache = GStorage.userInfo;

  @override
  void initState() {