diff --git a/lib/models/common/home_tab_type.dart b/lib/models/common/home_tab_type.dart index 7ea5777b..8d367b65 100644 --- a/lib/models/common/home_tab_type.dart +++ b/lib/models/common/home_tab_type.dart @@ -8,9 +8,7 @@ import 'package:PiliPlus/pages/rank/controller.dart'; import 'package:PiliPlus/pages/rank/view.dart'; import 'package:PiliPlus/pages/rcmd/controller.dart'; import 'package:PiliPlus/pages/rcmd/view.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; enum HomeTabType { live('直播'), @@ -26,60 +24,36 @@ enum HomeTabType { List get homeTabsConfig => [ { - 'icon': const Icon( - Icons.live_tv_outlined, - size: 15, - ), 'label': '直播', 'type': HomeTabType.live, 'ctr': Get.find, 'page': const LivePage(), }, { - 'icon': const Icon( - Icons.thumb_up_off_alt_outlined, - size: 15, - ), 'label': '推荐', 'type': HomeTabType.rcmd, 'ctr': Get.find, 'page': const RcmdPage(), }, { - 'icon': const Icon( - Icons.whatshot_outlined, - size: 15, - ), 'label': '热门', 'type': HomeTabType.hot, 'ctr': Get.find, 'page': const HotPage(), }, { - 'icon': const Icon( - Icons.category_outlined, - size: 15, - ), 'label': '分区', 'type': HomeTabType.rank, 'ctr': Get.find, 'page': const RankPage(), }, { - 'icon': const Icon( - Icons.play_circle_outlined, - size: 15, - ), 'label': '番剧', 'type': HomeTabType.bangumi, 'ctr': Get.find, 'page': const BangumiPage(tabType: HomeTabType.bangumi), }, { - 'icon': const Icon( - MdiIcons.theater, - size: 15, - ), 'label': '影视', 'type': HomeTabType.cinema, 'ctr': Get.find, diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart index 668bcb56..9a6a55b8 100644 --- a/lib/utils/page_utils.dart +++ b/lib/utils/page_utils.dart @@ -486,6 +486,7 @@ class PageUtils { } break; + // case 'DYNAMIC_TYPE_COURSES_SEASON': // 纯文字动态查看 // case 'DYNAMIC_TYPE_WORD': // # 装扮/剧集点评/普通分享 @@ -495,13 +496,18 @@ class PageUtils { // 图文动态查看 // case 'DYNAMIC_TYPE_DRAW': default: - toDupNamed( - '/dynamicDetail', - arguments: { - 'item': item, - 'floor': floor, - }, - ); + if (item.basic?.commentIdStr?.isNotEmpty == true) { + toDupNamed( + '/dynamicDetail', + arguments: { + 'item': item, + 'floor': floor, + }, + ); + } else { + pushDynFromId(id: item.idStr); + } + break; } }