opt models

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2026-04-26 05:16:01 +08:00 · 2025-06-04 15:20:35 +08:00
parent f50b1d2beb
commit b960359a39
858 changed files with 11000 additions and 12588 deletions
--- a/lib/pages/history/controller.dart
+++ b/lib/pages/history/controller.dart
@@ -1,6 +1,8 @@
 import 'package:PiliPlus/http/loading_state.dart';
 import 'package:PiliPlus/http/user.dart';
-import 'package:PiliPlus/models/user/history.dart';
+import 'package:PiliPlus/models_new/history/data.dart';
+import 'package:PiliPlus/models_new/history/list.dart';
+import 'package:PiliPlus/models_new/history/tab.dart';
 import 'package:PiliPlus/pages/common/multi_select_controller.dart';
 import 'package:PiliPlus/pages/history/base_controller.dart';
 import 'package:PiliPlus/utils/extension.dart';
@@ -9,7 +11,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';

-class HistoryController extends MultiSelectController<HistoryData, HisListItem>
+class HistoryController
+    extends MultiSelectController<HistoryData, HistoryItemModel>
    with GetSingleTickerProviderStateMixin {
  HistoryController(this.type);

@@ -17,7 +20,7 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>

  final String? type;
  TabController? tabController;
-  late RxList<HisTabItem> tabs = <HisTabItem>[].obs;
+  late RxList<HistoryTab> tabs = <HistoryTab>[].obs;

  int? max;
  int? viewAt;
@@ -38,7 +41,7 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>

  @override
  void onSelect(int index, [bool disableSelect = true]) {
-    List<HisListItem> list = loadingState.value.data!;
+    List<HistoryItemModel> list = loadingState.value.data!;
    list[index].checked = !(list[index].checked ?? false);
    baseCtr.checkedCount.value =
        list.where((item) => item.checked == true).length;
@@ -51,9 +54,9 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>
  @override
  void handleSelect([bool checked = false, bool disableSelect = true]) {
    if (loadingState.value.isSuccess) {
-      List<HisListItem>? list = loadingState.value.data;
+      List<HistoryItemModel>? list = loadingState.value.data;
      if (list?.isNotEmpty == true) {
-        for (HisListItem item in list!) {
+        for (HistoryItemModel item in list!) {
          item.checked = checked;
        }
        baseCtr.checkedCount.value = checked ? list.length : 0;
@@ -66,7 +69,7 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>
  }

  @override
-  List<HisListItem>? getDataList(HistoryData response) {
+  List<HistoryItemModel>? getDataList(HistoryData response) {
    return response.list;
  }

@@ -102,14 +105,14 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>
  }

  // 删除某条历史记录
-  void delHistory(HisListItem item) {
+  void delHistory(HistoryItemModel item) {
    _onDelete([item]);
  }

  // 删除已看历史记录
  void onDelHistory() {
    if (loadingState.value.isSuccess) {
-      List<HisListItem> list =
+      List<HistoryItemModel> list =
          loadingState.value.data!.where((e) => e.progress == -1).toList();
      if (list.isNotEmpty) {
        _onDelete(list);
@@ -119,14 +122,14 @@ class HistoryController extends MultiSelectController<HistoryData, HisListItem>
    }
  }

-  Future<void> _onDelete(List<HisListItem> result) async {
+  Future<void> _onDelete(List<HistoryItemModel> result) async {
    SmartDialog.showLoading(msg: '请求中');
    List<String> kidList = result.map((item) {
      return '${item.history.business}_${item.kid}';
    }).toList();
    var response = await UserHttp.delHistory(kidList);
    if (response['status']) {
-      List<HisListItem> remainList =
+      List<HistoryItemModel> remainList =
          loadingState.value.data!.toSet().difference(result.toSet()).toList();
      if (remainList.isNotEmpty) {
        loadingState.value = Success(remainList);
--- a/lib/pages/history/view.dart
+++ b/lib/pages/history/view.dart
@@ -5,7 +5,7 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
 import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
-import 'package:PiliPlus/models/user/history.dart';
+import 'package:PiliPlus/models_new/history/list.dart';
 import 'package:PiliPlus/pages/history/base_controller.dart';
 import 'package:PiliPlus/pages/history/controller.dart';
 import 'package:PiliPlus/pages/history/widgets/item.dart';
@@ -254,7 +254,7 @@ class _HistoryPageState extends State<HistoryPage>
        ),
      );

-  Widget _buildBody(LoadingState<List<HisListItem>?> loadingState) {
+  Widget _buildBody(LoadingState<List<HistoryItemModel>?> loadingState) {
    return switch (loadingState) {
      Loading() => SliverGrid(
          gridDelegate: Grid.videoCardHDelegate(context),
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -5,11 +5,9 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/progress_bar/video_progress_indicator.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/http/user.dart';
-import 'package:PiliPlus/http/video.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/history_business_type.dart';
-import 'package:PiliPlus/models/user/history.dart';
-import 'package:PiliPlus/models/video_detail/data.dart';
+import 'package:PiliPlus/models_new/history/list.dart';
 import 'package:PiliPlus/pages/common/multi_select_controller.dart';
 import 'package:PiliPlus/pages/history/base_controller.dart';
 import 'package:PiliPlus/utils/feed_back.dart';
@@ -22,7 +20,7 @@ import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';

 class HistoryItem extends StatelessWidget {
-  final HisListItem videoItem;
+  final HistoryItemModel videoItem;
  final dynamic ctr;
  final Function? onChoose;
  final Function(dynamic kid, dynamic business) onDelete;
@@ -64,41 +62,15 @@ class HistoryItem extends StatelessWidget {
          } else {
            SmartDialog.showToast('直播未开播');
          }
-        } else if (videoItem.history.business == 'pgc' ||
-            videoItem.tagName?.contains('动画') == true) {
-          var bvid = videoItem.history.bvid;
-          if (bvid != null && bvid != '') {
-            var result = await VideoHttp.videoIntro(bvid: bvid);
-            if (result['status']) {
-              VideoDetailData data = result['data'];
-              String bvid = data.bvid!;
-              var epid = data.epId;
-              if (epid != null) {
-                PageUtils.viewBangumi(epId: epid);
-              } else {
-                int? cid = videoItem.history.cid ??
-                    await SearchHttp.ab2c(aid: aid, bvid: bvid);
-                if (cid != null) {
-                  PageUtils.toVideoPage(
-                    'bvid=$bvid&cid=$cid',
-                    arguments: {
-                      'heroTag': Utils.makeHeroTag(cid),
-                      'pic': videoItem.cover,
-                    },
-                  );
-                }
-              }
-            } else {
-              SmartDialog.showToast(result['msg']);
-            }
-          } else {
-            if (videoItem.history.epid != null && videoItem.history.epid != 0) {
-              PageUtils.viewBangumi(epId: videoItem.history.epid);
-            }
-          }
+        } else if (videoItem.history.business == 'pgc') {
+          PageUtils.viewPgc(epId: videoItem.history.epid);
        } else {
          int? cid = videoItem.history.cid ??
-              await SearchHttp.ab2c(aid: aid, bvid: bvid);
+              await SearchHttp.ab2c(
+                aid: aid,
+                bvid: bvid,
+                part: videoItem.history.page,
+              );
          if (cid != null) {
            PageUtils.toVideoPage(
              'bvid=$bvid&cid=$cid',
@@ -324,7 +296,7 @@ class HistoryItem extends StatelessWidget {
        children: [
          Expanded(
            child: Text(
-              videoItem.title,
+              videoItem.title!,
              textAlign: TextAlign.start,
              style: TextStyle(
                fontSize: theme.textTheme.bodyMedium!.fontSize,