Merge branch 'main' of https://github.com/guozhigq/pilipala into guoz…

…higq-main
orz12 · Jan 22, 2024 · 54ca42f · 54ca42f
2 parents fdef234 + e052c6e
commit 54ca42f
Show file tree

Hide file tree

Showing 25 changed files with 341 additions and 201 deletions.
diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
@@ -69,7 +69,7 @@ class VideoCardH extends StatelessWidget {
               final double width = (boxConstraints.maxWidth -
                       StyleString.cardSpace *
                           6 /
-                          MediaQuery.of(context).textScaleFactor) /
+                          MediaQuery.textScalerOf(context).scale(1.0)) /
                   2;
               return Container(
                 constraints: const BoxConstraints(minHeight: 88),

diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
@@ -342,7 +342,8 @@ class VideoStat extends StatelessWidget {
             maxLines: 1,
             text: TextSpan(
                 style: TextStyle(
-                  fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+                  fontSize:  MediaQuery.textScalerOf(context)
+              .scale(Theme.of(context).textTheme.labelSmall!.fontSize),
                   color: Theme.of(context).colorScheme.outline,
                 ),
                 text: Utils.formatTimestampToRelativeTime(videoItem.pubdate)),

diff --git a/lib/http/api.dart b/lib/http/api.dart
@@ -467,4 +467,7 @@ class Api {
   /// page_size
   static const getSeasonDetailApi =
       '/x/polymer/web-space/seasons_archives_list';
+
+  /// 获取未读动态数
+  static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
 }
diff --git a/lib/http/common.dart b/lib/http/common.dart
@@ -0,0 +1,17 @@
+import 'index.dart';
+
+class CommonHttp {
+  static Future unReadDynamic() async {
+    var res = await Request().get(Api.getUnreadDynamic,
+        data: {'alltype_offset': 0, 'video_offset': '', 'article_offset': 0});
+    if (res.data['code'] == 0) {
+      return {'status': true, 'data': res.data['data']['dyn_basic_infos']};
+    } else {
+      return {
+        'status': false,
+        'data': [],
+        'msg': res.data['message'],
+      };
+    }
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -158,9 +158,8 @@ class MyApp extends StatelessWidget {
             return FlutterSmartDialog(
               toastBuilder: (String msg) => CustomToast(msg: msg),
               child: MediaQuery(
-                data: MediaQuery.of(context).copyWith(
-                    textScaleFactor:
-                        MediaQuery.of(context).textScaleFactor * textScale),
+                data: MediaQuery.of(context)
+                    .copyWith(textScaler: TextScaler.linear(textScale)),
                 child: child!,
               ),
             );

diff --git a/lib/models/common/tab_type.dart b/lib/models/common/tab_type.dart
@@ -9,6 +9,7 @@ enum TabType { live, rcmd, hot, bangumi }
 
 extension TabTypeDesc on TabType {
   String get description => ['直播', '推荐', '热门', '番剧'][index];
+  String get id => ['live', 'rcmd', 'hot', 'bangumi'][index];
 }
 
 List tabsConfig = [

diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart
@@ -224,7 +224,7 @@ class _BangumiPageState extends State<BangumiPage>
         // 列数
         crossAxisCount: 3,
         mainAxisExtent: Get.size.width / 3 / 0.65 +
-            32 * MediaQuery.of(context).textScaleFactor,
+            MediaQuery.textScalerOf(context).scale(32.0),
       ),
       delegate: SliverChildBuilderDelegate(
         (BuildContext context, int index) {

diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart
@@ -8,54 +8,33 @@ import 'package:pilipala/utils/storage.dart';
 
 class HomeController extends GetxController with GetTickerProviderStateMixin {
   bool flag = false;
-  late List tabs;
+  late RxList tabs = [].obs;
   RxInt initialIndex = 1.obs;
   late TabController tabController;
   late List tabsCtrList;
   late List<Widget> tabsPageList;
   Box userInfoCache = GStrorage.userInfo;
+  Box settingStorage = GStrorage.setting;
   RxBool userLogin = false.obs;
   RxString userFace = ''.obs;
   var userInfo;
   Box setting = GStrorage.setting;
   late final StreamController<bool> searchBarStream =
       StreamController<bool>.broadcast();
   late bool hideSearchBar;
+  late List defaultTabs;
+  late List<String> tabbarSort;
 
   @override
   void onInit() {
     super.onInit();
     userInfo = userInfoCache.get('userInfoCache');
     userLogin.value = userInfo != null;
     userFace.value = userInfo != null ? userInfo.face : '';
-
     // 进行tabs配置
-    tabs = tabsConfig;
-    tabsCtrList = tabsConfig.map((e) => e['ctr']).toList();
-    tabsPageList = tabsConfig.map<Widget>((e) => e['page']).toList();
-
-    tabController = TabController(
-      initialIndex: initialIndex.value,
-      length: tabs.length,
-      vsync: this,
-    );
+    setTabConfig();
     hideSearchBar =
         setting.get(SettingBoxKey.hideSearchBar, defaultValue: true);
-
-    // 监听 tabController 切换
-    tabController.animation!.addListener(() {
-      if (tabController.indexIsChanging) {
-        if (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;
-        }
-      }
-    });
   }
 
   void onRefresh() {
@@ -77,4 +56,42 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
     if (val) return;
     userFace.value = userInfo != null ? userInfo.face : '';
   }
+
+  void setTabConfig() async {
+    defaultTabs = tabsConfig;
+    tabbarSort = settingStorage.get(SettingBoxKey.tabbarSort,
+        defaultValue: ['live', 'rcmd', 'hot', 'bangumi']);
+
+    tabs.value = defaultTabs
+        .where((i) => tabbarSort.contains((i['type'] as TabType).id))
+        .toList();
+
+    if (tabbarSort.contains(TabType.rcmd.id)) {
+      initialIndex.value = tabbarSort.indexOf(TabType.rcmd.id);
+    } else {
+      initialIndex.value = 0;
+    }
+    tabsCtrList = tabs.map((e) => e['ctr']).toList();
+    tabsPageList = tabs.map<Widget>((e) => e['page']).toList();
+
+    tabController = TabController(
+      initialIndex: initialIndex.value,
+      length: tabs.length,
+      vsync: this,
+    );
+    // 监听 tabController 切换
+    tabController.animation!.addListener(() {
+      if (tabController.indexIsChanging) {
+        if (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;
+        }
+      }
+    });
+  }
 }
diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart
@@ -90,7 +90,11 @@ class _HomePageState extends State<HomePage>
                 ctr: _homeController,
                 callback: showUserBottomSheet,
               ),
-              const CustomTabs(),
+              if (_homeController.tabs.length > 1) ...[
+                const CustomTabs(),
+              ] else ...[
+                const SizedBox(height: 6),
+              ],
               Expanded(
                 child: TabBarView(
                   controller: _homeController.tabController,
@@ -250,17 +254,6 @@ class CustomTabs extends StatefulWidget {
 
 class _CustomTabsState extends State<CustomTabs> {
   final HomeController _homeController = Get.put(HomeController());
-  int currentTabIndex = 1;
-
-  @override
-  void initState() {
-    super.initState();
-    _homeController.tabController.addListener(listen);
-  }
-
-  void listen() {
-    _homeController.initialIndex.value = _homeController.tabController.index;
-  }
 
   void onTap(int index) {
     feedBack();
@@ -271,34 +264,30 @@ class _CustomTabsState extends State<CustomTabs> {
     _homeController.tabController.index = index;
   }
 
-  @override
-  void dispose() {
-    super.dispose();
-    _homeController.tabController.removeListener(listen);
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
       height: 44,
       margin: const EdgeInsets.only(top: 4),
-      child: ListView.separated(
-        padding: const EdgeInsets.symmetric(horizontal: 14.0),
-        scrollDirection: Axis.horizontal,
-        itemCount: _homeController.tabs.length,
-        separatorBuilder: (BuildContext context, int index) {
-          return const SizedBox(width: 10);
-        },
-        itemBuilder: (BuildContext context, int index) {
-          String label = _homeController.tabs[index]['label'];
-          return Obx(
-            () => CustomChip(
-              onTap: () => onTap(index),
-              label: label,
-              selected: index == _homeController.initialIndex.value,
-            ),
-          );
-        },
+      child: Obx(
+        () => ListView.separated(
+          padding: const EdgeInsets.symmetric(horizontal: 14.0),
+          scrollDirection: Axis.horizontal,
+          itemCount: _homeController.tabs.length,
+          separatorBuilder: (BuildContext context, int index) {
+            return const SizedBox(width: 10);
+          },
+          itemBuilder: (BuildContext context, int index) {
+            String label = _homeController.tabs[index]['label'];
+            return Obx(
+              () => CustomChip(
+                onTap: () => onTap(index),
+                label: label,
+                selected: index == _homeController.initialIndex.value,
+              ),
+            );
+          },
+        ),
       ),
     );
   }

diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart
@@ -162,8 +162,9 @@ class _LivePageState extends State<LivePage>
         crossAxisCount: crossAxisCount,
         mainAxisExtent:
             Get.size.width / crossAxisCount / StyleString.aspectRatio +
-                (crossAxisCount == 1 ? 48 : 68) *
-                    MediaQuery.of(context).textScaleFactor,
+                MediaQuery.textScalerOf(context).scale(
+                  (crossAxisCount == 1 ? 48 : 68),
+                ),
       ),
       delegate: SliverChildBuilderDelegate(
         (BuildContext context, int index) {

diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart
@@ -1,9 +1,11 @@
 import 'dart:async';
 
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:pilipala/http/common.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/media/index.dart';
@@ -27,6 +29,7 @@ class MainController extends GetxController {
         size: 21,
       ),
       'label': "首页",
+      'count': 0,
     },
     {
       'icon': const Icon(
@@ -38,6 +41,7 @@ class MainController extends GetxController {
         size: 21,
       ),
       'label': "动态",
+      'count': 0,
     },
     {
       'icon': const Icon(
@@ -49,13 +53,18 @@ class MainController extends GetxController {
         size: 21,
       ),
       'label': "媒体库",
+      'count': 0,
     }
   ].obs;
   final StreamController<bool> bottomBarStream =
       StreamController<bool>.broadcast();
   Box setting = GStrorage.setting;
   DateTime? _lastPressedAt;
   late bool hideTabBar;
+  late PageController pageController;
+  int selectedIndex = 0;
+  Box userInfoCache = GStrorage.userInfo;
+  RxBool userLogin = false.obs;
 
   @override
   void onInit() {
@@ -64,17 +73,47 @@ class MainController extends GetxController {
       Utils.checkUpdata();
     }
     hideTabBar = setting.get(SettingBoxKey.hideTabBar, defaultValue: true);
+    var userInfo = userInfoCache.get('userInfoCache');
+    userLogin.value = userInfo != null;
+    getUnreadDynamic();
   }
 
-  Future<bool> onBackPressed(BuildContext context) {
+  void onBackPressed(BuildContext context) {
     if (_lastPressedAt == null ||
         DateTime.now().difference(_lastPressedAt!) >
             const Duration(seconds: 2)) {
       // 两次点击时间间隔超过2秒，重新记录时间戳
       _lastPressedAt = DateTime.now();
+      if (selectedIndex != 0) {
+        pageController.jumpTo(0);
+      }
       SmartDialog.showToast("再按一次退出Pili");
-      return Future.value(false); // 不退出应用
+      return; // 不退出应用
     }
-    return Future.value(true); // 退出应用
+    SystemNavigator.pop(); // 退出应用
+  }
+
+  void getUnreadDynamic() async {
+    if (!userLogin.value) {
+      return;
+    }
+    int dynamicItemIndex =
+        navigationBars.indexWhere((item) => item['label'] == "动态");
+    var res = await CommonHttp.unReadDynamic();
+    var data = res['data'];
+    if (dynamicItemIndex != -1) {
+      navigationBars[dynamicItemIndex]['count'] =
+          data == null ? 0 : data.length; // 修改 count 属性为新的值
+    }
+    navigationBars.refresh();
+  }
+
+  void clearUnread() async {
+    int dynamicItemIndex =
+        navigationBars.indexWhere((item) => item['label'] == "动态");
+    if (dynamicItemIndex != -1) {
+      navigationBars[dynamicItemIndex]['count'] = 0; // 修改 count 属性为新的值
+    }
+    navigationBars.refresh();
   }
 }