From 7f70ee5045ab54c51fe63acab26c6fdfc857522c Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Sat, 3 May 2025 13:57:47 +0800 Subject: [PATCH] refa: dir Signed-off-by: bggRGjQaUbCoE --- lib/common/widgets/network_img_layer.dart | 2 +- .../widgets}/toolbar_icon_button.dart | 0 lib/common/widgets/video_card_h.dart | 14 +-- lib/common/widgets/video_card_h_grpc.dart | 8 +- .../widgets/video_card_h_member_video.dart | 10 +-- lib/common/widgets/video_card_v.dart | 18 ++-- .../widgets/video_card_v_member_home.dart | 12 +-- lib/common/widgets/video_popup_menu.dart | 19 ++-- lib/http/bangumi.dart | 10 +-- lib/http/black.dart | 6 +- lib/http/common.dart | 3 +- lib/http/danmaku.dart | 3 +- lib/http/danmaku_block.dart | 7 +- lib/http/dynamics.dart | 15 ++-- lib/http/fan.dart | 6 +- lib/http/follow.dart | 6 +- lib/http/index.dart | 2 - lib/http/init.dart | 4 +- lib/http/live.dart | 10 +-- lib/http/login.dart | 11 +-- lib/http/member.dart | 44 +++++---- lib/http/msg.dart | 11 ++- lib/http/reply.dart | 9 +- lib/http/retry_interceptor.dart | 3 +- lib/http/search.dart | 13 +-- lib/http/user.dart | 22 ++--- lib/http/video.dart | 32 +++---- lib/main.dart | 2 +- lib/models/bangumi/pgc_index/condition.dart | 6 +- lib/models/common/tab_type.dart | 14 +-- lib/models/login/{index.dart => model.dart} | 0 lib/models/space/archive.dart | 20 ++--- lib/models/space/archive.g.dart | 2 +- lib/models/space/card.dart | 6 +- lib/models/space/card.g.dart | 4 +- lib/models/space/coin_archive.dart | 2 +- lib/models/space/coin_archive.g.dart | 2 +- lib/models/space/data.dart | 14 +-- lib/models/space/data.g.dart | 10 +-- lib/models/space/images.dart | 60 ++++++------- lib/models/space/images.g.dart | 4 +- lib/models/space/item.dart | 6 +- lib/models/space/item.g.dart | 4 +- lib/models/space/like_archive.dart | 2 +- lib/models/space/like_archive.g.dart | 2 +- lib/models/space/season.dart | 2 +- lib/models/space/season.g.dart | 2 +- lib/models/space/space.dart | 14 +-- lib/models/space/space.g.dart | 2 +- lib/models/space/tab2.dart | 12 +-- lib/models/space/tab2.g.dart | 2 +- lib/models/space_archive/data.dart | 9 +- lib/models/space_archive/data.g.dart | 7 +- lib/models/space_archive/item.dart | 4 +- lib/models/space_archive/space_archive.dart | 18 ++-- lib/models/space_archive/space_archive.g.dart | 2 +- lib/models/space_article/data.dart | 9 +- lib/models/space_article/data.g.dart | 7 +- lib/models/space_article/item.dart | 4 +- lib/models/space_article/space_article.dart | 18 ++-- lib/models/space_article/space_article.g.dart | 2 +- lib/models/space_fav/datum.dart | 17 ++-- lib/models/space_fav/datum.g.dart | 4 +- lib/models/space_fav/space_fav.dart | 18 ++-- lib/models/space_fav/space_fav.g.dart | 2 +- lib/pages/about/view.dart | 4 +- lib/pages/article/controller.dart | 2 +- lib/pages/article/view.dart | 11 ++- lib/pages/article/widgets/html_render.dart | 2 +- lib/pages/bangumi/index.dart | 4 - lib/pages/bangumi/introduction/index.dart | 4 - lib/pages/bangumi/view.dart | 11 ++- .../widgets/bangumi_card_v_member_home.dart | 4 +- lib/pages/common/reply_controller.dart | 2 +- lib/pages/contact/view.dart | 2 +- lib/pages/danmaku/index.dart | 4 - lib/pages/danmaku/view.dart | 5 +- lib/pages/danmaku_block/view.dart | 3 +- lib/pages/dynamics/controller.dart | 9 +- lib/pages/dynamics/detail/index.dart | 4 - lib/pages/dynamics/index.dart | 4 - lib/pages/dynamics/tab/index.dart | 4 - lib/pages/dynamics/view.dart | 2 +- lib/pages/dynamics/widgets/action_panel.dart | 2 +- lib/pages/dynamics/widgets/article_panel.dart | 5 +- lib/pages/dynamics/widgets/author_panel.dart | 7 +- lib/pages/dynamics/widgets/forward_panel.dart | 17 ++-- .../view.dart} | 2 +- .../controller.dart | 0 .../detail => dynamics_detail}/view.dart | 13 ++- .../view.dart} | 2 +- .../tab => dynamics_tab}/controller.dart | 3 +- .../{dynamics/tab => dynamics_tab}/view.dart | 12 ++- lib/pages/emote/controller.dart | 3 +- lib/pages/emote/index.dart | 4 - lib/pages/emote/view.dart | 4 +- .../episode_panel/view.dart} | 6 +- lib/pages/fan/index.dart | 4 - lib/pages/fan/view.dart | 5 +- lib/pages/fav/video/index.dart | 4 - lib/pages/fav/video/view.dart | 7 +- lib/pages/fav/view.dart | 5 +- .../view.dart} | 0 lib/pages/fav_detail/index.dart | 4 - lib/pages/fav_detail/view.dart | 11 ++- .../fav_detail/widget/fav_video_card.dart | 2 +- .../view.dart} | 0 .../fav_panel.dart => fav_panel/view.dart} | 3 +- .../fav_sort_page.dart | 0 lib/pages/follow/index.dart | 4 - .../widgets => group_panel}/group_panel.dart | 0 lib/pages/history/index.dart | 4 - lib/pages/history/view.dart | 9 +- lib/pages/home/controller.dart | 9 +- lib/pages/home/index.dart | 4 - lib/pages/home/view.dart | 2 +- lib/pages/hot/index.dart | 4 - lib/pages/hot/view.dart | 5 +- lib/pages/later/index.dart | 4 - lib/pages/live/index.dart | 3 - lib/pages/live/view.dart | 3 +- lib/pages/live_emote/index.dart | 4 - lib/pages/live_emote/view.dart | 4 +- lib/pages/live_room/controller.dart | 7 +- lib/pages/live_room/index.dart | 4 - .../view.dart} | 2 +- lib/pages/live_room/view.dart | 13 +-- .../live_room/widgets/bottom_control.dart | 5 +- .../live_room/widgets/header_control.dart | 2 +- lib/pages/login/controller.dart | 2 +- lib/pages/login/index.dart | 4 - lib/pages/main/controller.dart | 4 +- lib/pages/main/index.dart | 4 - lib/pages/main/view.dart | 8 +- lib/pages/media/index.dart | 4 - lib/pages/media/view.dart | 2 +- lib/pages/member/controller.dart | 10 +-- .../member/{member_page.dart => view.dart} | 18 ++-- lib/pages/member/widget/user_info_card.dart | 8 +- .../controller.dart} | 10 ++- .../view.dart} | 6 +- .../widget/item.dart | 2 +- .../view.dart} | 0 lib/pages/member_coin/index.dart | 4 - .../controller.dart} | 7 +- .../view.dart} | 10 +-- lib/pages/member_dynamics/index.dart | 4 - lib/pages/member_dynamics/view.dart | 13 ++- .../controller.dart} | 6 +- .../view.dart} | 6 +- .../widget/item.dart | 0 .../view.dart} | 14 +-- .../member_home/widget/fav_item.dart | 0 lib/pages/member_like/index.dart | 4 - .../controller.dart} | 15 ++-- .../view.dart} | 4 +- .../view.dart} | 2 +- .../controller.dart | 0 .../view.dart} | 8 +- .../widget/season_series_card.dart | 0 .../controller.dart} | 20 +++-- .../view.dart} | 10 +-- lib/pages/mine/index.dart | 4 - lib/pages/msg_feed_top/at_me/index.dart | 4 - lib/pages/msg_feed_top/like_me/index.dart | 4 - lib/pages/msg_feed_top/like_me/view.dart | 5 +- lib/pages/msg_feed_top/reply_me/index.dart | 4 - lib/pages/msg_feed_top/reply_me/view.dart | 5 +- lib/pages/msg_feed_top/sys_msg/index.dart | 4 - .../controller.dart} | 4 +- .../view.dart} | 9 +- lib/pages/rank/controller.dart | 2 +- lib/pages/rank/index.dart | 4 - lib/pages/rank/zone/index.dart | 4 - lib/pages/rank/zone/view.dart | 5 +- lib/pages/rcmd/index.dart | 4 - lib/pages/rcmd/view.dart | 5 +- .../save_panel/view.dart} | 6 +- lib/pages/search/index.dart | 4 - lib/pages/search_result/index.dart | 4 - lib/pages/setting/navigation_bar_set.dart | 3 +- lib/pages/setting/pages/color_select.dart | 2 +- lib/pages/setting/pages/logs.dart | 2 +- .../view.dart} | 0 .../view.dart} | 2 +- lib/pages/subscription/controller.dart | 3 +- lib/pages/subscription/index.dart | 4 - lib/pages/subscription/widgets/item.dart | 3 +- lib/pages/subscription_detail/controller.dart | 5 +- lib/pages/subscription_detail/index.dart | 4 - lib/pages/subscription_detail/view.dart | 9 +- .../widget/sub_video_card.dart | 4 +- lib/pages/video/README.md | 10 --- .../widgets/ai_detail.dart => ai/view.dart} | 2 +- lib/pages/video/{detail => }/controller.dart | 19 ++-- lib/pages/video/detail/index.dart | 4 - .../video/detail/introduction/index.dart | 4 - lib/pages/video/detail/related/index.dart | 4 - lib/pages/video/detail/reply/index.dart | 4 - lib/pages/video/detail/reply_reply/index.dart | 4 - .../introduction/pgc}/controller.dart | 10 +-- .../introduction/pgc}/view.dart | 13 ++- .../pgc}/widgets/bangumi_panel.dart | 2 +- .../pgc}/widgets/intro_detail.dart | 3 +- .../ugc}/controller.dart | 15 ++-- .../ugc}/view.dart | 4 +- .../ugc}/widgets/action_item.dart | 0 .../ugc}/widgets/action_row_item.dart | 0 .../ugc}/widgets/menu_row.dart | 0 .../ugc}/widgets/page.dart | 7 +- .../ugc}/widgets/season.dart | 4 +- .../view.dart} | 0 .../video/{detail => }/member/controller.dart | 7 +- .../view.dart} | 12 +-- .../controller.dart} | 0 .../note_list_page.dart => note/view.dart} | 4 +- .../view.dart} | 0 .../post_panel.dart => post_panel/view.dart} | 4 +- .../{detail => }/related/controller.dart | 0 .../video/{detail => }/related/view.dart | 6 +- .../video/{detail => }/reply/controller.dart | 0 lib/pages/video/{detail => }/reply/view.dart | 2 +- .../reply/widgets/reply_item_grpc.dart | 6 +- .../{detail => }/reply/widgets/zan_grpc.dart | 0 .../reply_page.dart => reply_new/view.dart} | 2 +- .../{detail => }/reply_reply/controller.dart | 0 .../video/{detail => }/reply_reply/view.dart | 4 +- .../view.dart} | 0 .../video/{detail/view_v.dart => view.dart} | 43 +++++---- .../view.dart} | 4 +- .../video/{detail => }/widgets/app_bar.dart | 2 +- .../{detail => }/widgets/header_control.dart | 17 ++-- .../webview/{webview_page.dart => view.dart} | 0 lib/pages/whisper/controller.dart | 5 +- lib/pages/whisper/index.dart | 4 - lib/pages/whisper_detail/controller.dart | 4 +- lib/pages/whisper_detail/index.dart | 4 - .../whisper_detail/widget/chat_item.dart | 3 +- lib/plugin/pl_player/controller.dart | 6 +- lib/plugin/pl_player/index.dart | 14 --- lib/plugin/pl_player/utils/fullscreen.dart | 3 +- lib/plugin/pl_player/view.dart | 29 +++--- .../pl_player/widgets/bottom_control.dart | 13 +-- .../pl_player/widgets/play_pause_btn.dart | 2 +- lib/router/app_pages.dart | 90 +++++++++---------- lib/services/audio_handler.dart | 3 +- lib/services/audio_session.dart | 3 +- lib/services/shutdown_timer_service.dart | 3 +- lib/utils/accounts/account_adapter.dart | 5 +- .../accounts/account_manager/account_mgr.dart | 3 +- lib/utils/accounts/account_type_adapter.dart | 3 +- lib/utils/app_scheme.dart | 10 +-- lib/utils/login_utils.dart | 6 +- lib/utils/page_utils.dart | 4 +- lib/utils/request_utils.dart | 6 +- lib/utils/storage.dart | 2 +- lib/utils/url_utils.dart | 9 +- lib/utils/utils.dart | 7 +- lib/utils/video_utils.dart | 3 +- lib/utils/wbi_sign.dart | 5 +- 260 files changed, 748 insertions(+), 967 deletions(-) rename lib/{pages/video/detail/reply_new => common/widgets}/toolbar_icon_button.dart (100%) delete mode 100644 lib/http/index.dart rename lib/models/login/{index.dart => model.dart} (100%) delete mode 100644 lib/pages/bangumi/index.dart delete mode 100644 lib/pages/bangumi/introduction/index.dart delete mode 100644 lib/pages/danmaku/index.dart delete mode 100644 lib/pages/dynamics/detail/index.dart delete mode 100644 lib/pages/dynamics/index.dart delete mode 100644 lib/pages/dynamics/tab/index.dart rename lib/pages/{dynamics/create_dyn_panel.dart => dynamics_create/view.dart} (99%) rename lib/pages/{dynamics/detail => dynamics_detail}/controller.dart (100%) rename lib/pages/{dynamics/detail => dynamics_detail}/view.dart (98%) rename lib/pages/{dynamics/repost_dyn_panel.dart => dynamics_repost/view.dart} (99%) rename lib/pages/{dynamics/tab => dynamics_tab}/controller.dart (98%) rename lib/pages/{dynamics/tab => dynamics_tab}/view.dart (96%) delete mode 100644 lib/pages/emote/index.dart rename lib/{common/widgets/episode_panel.dart => pages/episode_panel/view.dart} (99%) delete mode 100644 lib/pages/fan/index.dart delete mode 100644 lib/pages/fav/video/index.dart rename lib/pages/{video/detail/introduction/widgets/create_fav_page.dart => fav_create/view.dart} (100%) delete mode 100644 lib/pages/fav_detail/index.dart rename lib/pages/{fav/video/fav_folder_sort_page.dart => fav_folder_sort/view.dart} (100%) rename lib/pages/{video/detail/introduction/widgets/fav_panel.dart => fav_panel/view.dart} (99%) rename lib/pages/{fav_detail => fav_sort}/fav_sort_page.dart (100%) delete mode 100644 lib/pages/follow/index.dart rename lib/pages/{video/detail/introduction/widgets => group_panel}/group_panel.dart (100%) delete mode 100644 lib/pages/history/index.dart delete mode 100644 lib/pages/home/index.dart delete mode 100644 lib/pages/hot/index.dart delete mode 100644 lib/pages/later/index.dart delete mode 100644 lib/pages/live/index.dart delete mode 100644 lib/pages/live_emote/index.dart delete mode 100644 lib/pages/live_room/index.dart rename lib/pages/live_room/{send_dm_panel.dart => send_danmaku/view.dart} (98%) delete mode 100644 lib/pages/login/index.dart delete mode 100644 lib/pages/main/index.dart delete mode 100644 lib/pages/media/index.dart rename lib/pages/member/{member_page.dart => view.dart} (95%) rename lib/pages/{member/content/member_contribute/content/article/member_article_ctr.dart => member_article/controller.dart} (70%) rename lib/pages/{member/content/member_contribute/content/article/member_article.dart => member_article/view.dart} (90%) rename lib/pages/{member/content/member_contribute/content/article => member_article}/widget/item.dart (99%) rename lib/pages/{member/content/member_contribute/content/audio/member_audio.dart => member_audio/view.dart} (100%) delete mode 100644 lib/pages/member_coin/index.dart rename lib/pages/{member/content/member_contribute/member_contribute_ctr.dart => member_contribute/controller.dart} (94%) rename lib/pages/{member/content/member_contribute/member_contribute.dart => member_contribute/view.dart} (88%) delete mode 100644 lib/pages/member_dynamics/index.dart rename lib/pages/{member/content/member_contribute/content/favorite/member_favorite_ctr.dart => member_favorite/controller.dart} (95%) rename lib/pages/{member/content/member_contribute/content/favorite/member_favorite.dart => member_favorite/view.dart} (94%) rename lib/pages/{member/content/member_contribute/content/favorite => member_favorite}/widget/item.dart (100%) rename lib/pages/{member/content/member_home/member_home.dart => member_home/view.dart} (96%) rename lib/pages/{member/content => }/member_home/widget/fav_item.dart (100%) delete mode 100644 lib/pages/member_like/index.dart rename lib/pages/{member/content/member_contribute/content/bangumi/member_bangumi_ctr.dart => member_pgc/controller.dart} (73%) rename lib/pages/{member/content/member_contribute/content/bangumi/member_bangumi.dart => member_pgc/view.dart} (95%) rename lib/pages/{member/widget/edit_profile_page.dart => member_profile/view.dart} (99%) rename lib/pages/{member/content/member_contribute/content/season_series => member_season_series}/controller.dart (100%) rename lib/pages/{member/content/member_contribute/content/season_series/season_series_page.dart => member_season_series/view.dart} (90%) rename lib/pages/{member/content/member_contribute/content/season_series => member_season_series}/widget/season_series_card.dart (100%) rename lib/pages/{member/content/member_contribute/content/video/member_video_ctr.dart => member_video/controller.dart} (92%) rename lib/pages/{member/content/member_contribute/content/video/member_video.dart => member_video/view.dart} (96%) delete mode 100644 lib/pages/mine/index.dart delete mode 100644 lib/pages/msg_feed_top/at_me/index.dart delete mode 100644 lib/pages/msg_feed_top/like_me/index.dart delete mode 100644 lib/pages/msg_feed_top/reply_me/index.dart delete mode 100644 lib/pages/msg_feed_top/sys_msg/index.dart rename lib/pages/{bangumi/pgc_index/pgc_index_controller.dart => pgc_index/controller.dart} (95%) rename lib/pages/{bangumi/pgc_index/pgc_index_page.dart => pgc_index/view.dart} (97%) delete mode 100644 lib/pages/rank/index.dart delete mode 100644 lib/pages/rank/zone/index.dart delete mode 100644 lib/pages/rcmd/index.dart rename lib/{common/widgets/save_panel.dart => pages/save_panel/view.dart} (99%) delete mode 100644 lib/pages/search/index.dart delete mode 100644 lib/pages/search_result/index.dart rename lib/pages/{setting/search_page.dart => settings_search/view.dart} (100%) rename lib/pages/{setting/sponsor_block_page.dart => sponsor_block/view.dart} (99%) delete mode 100644 lib/pages/subscription/index.dart delete mode 100644 lib/pages/subscription_detail/index.dart delete mode 100644 lib/pages/video/README.md rename lib/pages/video/{detail/widgets/ai_detail.dart => ai/view.dart} (98%) rename lib/pages/video/{detail => }/controller.dart (98%) delete mode 100644 lib/pages/video/detail/index.dart delete mode 100644 lib/pages/video/detail/introduction/index.dart delete mode 100644 lib/pages/video/detail/related/index.dart delete mode 100644 lib/pages/video/detail/reply/index.dart delete mode 100644 lib/pages/video/detail/reply_reply/index.dart rename lib/pages/{bangumi/introduction => video/introduction/pgc}/controller.dart (98%) rename lib/pages/{bangumi/introduction => video/introduction/pgc}/view.dart (98%) rename lib/pages/{bangumi => video/introduction/pgc}/widgets/bangumi_panel.dart (99%) rename lib/pages/{bangumi/introduction => video/introduction/pgc}/widgets/intro_detail.dart (99%) rename lib/pages/video/{detail/introduction => introduction/ugc}/controller.dart (98%) rename lib/pages/video/{detail/introduction => introduction/ugc}/view.dart (99%) rename lib/pages/video/{detail/introduction => introduction/ugc}/widgets/action_item.dart (100%) rename lib/pages/video/{detail/introduction => introduction/ugc}/widgets/action_row_item.dart (100%) rename lib/pages/video/{detail/introduction => introduction/ugc}/widgets/menu_row.dart (100%) rename lib/pages/video/{detail/introduction => introduction/ugc}/widgets/page.dart (97%) rename lib/pages/video/{detail/introduction => introduction/ugc}/widgets/season.dart (97%) rename lib/pages/video/{detail/widgets/media_list_panel.dart => medialist/view.dart} (100%) rename lib/pages/video/{detail => }/member/controller.dart (94%) rename lib/pages/video/{detail/member/horizontal_member_page.dart => member/view.dart} (97%) rename lib/pages/video/{detail/note/note_list_page_ctr.dart => note/controller.dart} (100%) rename lib/pages/video/{detail/note/note_list_page.dart => note/view.dart} (98%) rename lib/pages/video/{detail/introduction/pay_coins_page.dart => pay_coins/view.dart} (100%) rename lib/pages/video/{detail/post_panel/post_panel.dart => post_panel/view.dart} (99%) rename lib/pages/video/{detail => }/related/controller.dart (100%) rename lib/pages/video/{detail => }/related/view.dart (93%) rename lib/pages/video/{detail => }/reply/controller.dart (100%) rename lib/pages/video/{detail => }/reply/view.dart (99%) rename lib/pages/video/{detail => }/reply/widgets/reply_item_grpc.dart (99%) rename lib/pages/video/{detail => }/reply/widgets/zan_grpc.dart (100%) rename lib/pages/video/{detail/reply_new/reply_page.dart => reply_new/view.dart} (99%) rename lib/pages/video/{detail => }/reply_reply/controller.dart (100%) rename lib/pages/video/{detail => }/reply_reply/view.dart (99%) rename lib/pages/video/{detail/widgets/send_danmaku_panel.dart => send_danmaku/view.dart} (100%) rename lib/pages/video/{detail/view_v.dart => view.dart} (98%) rename lib/pages/video/{detail/view_point/view_points_page.dart => view_point/view.dart} (98%) rename lib/pages/video/{detail => }/widgets/app_bar.dart (96%) rename lib/pages/video/{detail => }/widgets/header_control.dart (99%) rename lib/pages/webview/{webview_page.dart => view.dart} (100%) delete mode 100644 lib/pages/whisper/index.dart delete mode 100644 lib/pages/whisper_detail/index.dart delete mode 100644 lib/plugin/pl_player/index.dart diff --git a/lib/common/widgets/network_img_layer.dart b/lib/common/widgets/network_img_layer.dart index fc38a5cbb..f63227d37 100644 --- a/lib/common/widgets/network_img_layer.dart +++ b/lib/common/widgets/network_img_layer.dart @@ -1,8 +1,8 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/extension.dart'; -import '../constants.dart'; class NetworkImgLayer extends StatelessWidget { const NetworkImgLayer({ diff --git a/lib/pages/video/detail/reply_new/toolbar_icon_button.dart b/lib/common/widgets/toolbar_icon_button.dart similarity index 100% rename from lib/pages/video/detail/reply_new/toolbar_icon_button.dart rename to lib/common/widgets/toolbar_icon_button.dart diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index 731f0549f..df7821b3a 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -1,19 +1,19 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/stat/stat.dart'; +import 'package:PiliPlus/common/widgets/video_popup_menu.dart'; import 'package:PiliPlus/common/widgets/video_progress_indicator.dart'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/models/model_video.dart'; import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import '../../http/search.dart'; -import '../../utils/utils.dart'; -import '../constants.dart'; -import 'badge.dart'; -import 'network_img_layer.dart'; -import 'stat/stat.dart'; -import 'video_popup_menu.dart'; // 视频卡片 - 水平布局 class VideoCardH extends StatelessWidget { diff --git a/lib/common/widgets/video_card_h_grpc.dart b/lib/common/widgets/video_card_h_grpc.dart index f603798b0..e6435ee00 100644 --- a/lib/common/widgets/video_card_h_grpc.dart +++ b/lib/common/widgets/video_card_h_grpc.dart @@ -1,12 +1,12 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/grpc/app/card/v1/card.pb.dart' as card; import 'package:PiliPlus/utils/app_scheme.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../../utils/utils.dart'; -import '../constants.dart'; -import 'badge.dart'; -import 'network_img_layer.dart'; // 视频卡片 - 水平布局 class VideoCardHGrpc extends StatelessWidget { diff --git a/lib/common/widgets/video_card_h_member_video.dart b/lib/common/widgets/video_card_h_member_video.dart index 5d28927fb..8884a1300 100644 --- a/lib/common/widgets/video_card_h_member_video.dart +++ b/lib/common/widgets/video_card_h_member_video.dart @@ -1,15 +1,15 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/common/widgets/video_popup_menu.dart'; import 'package:PiliPlus/common/widgets/video_progress_indicator.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../../utils/utils.dart'; -import '../constants.dart'; -import 'badge.dart'; -import 'network_img_layer.dart'; // 视频卡片 - 水平布局 class VideoCardHMemberVideo extends StatelessWidget { @@ -20,7 +20,7 @@ class VideoCardHMemberVideo extends StatelessWidget { this.bvid, this.fromViewAid, }); - final Item videoItem; + final SpaceArchiveItem videoItem; final VoidCallback? onTap; final dynamic bvid; final String? fromViewAid; diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 178bde3bf..9468930ca 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -1,19 +1,19 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; +import 'package:PiliPlus/common/widgets/stat/stat.dart'; +import 'package:PiliPlus/common/widgets/video_popup_menu.dart'; import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/models/home/rcmd/result.dart'; +import 'package:PiliPlus/models/model_rec_video_item.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import '../../models/home/rcmd/result.dart'; -import '../../models/model_rec_video_item.dart'; -import 'stat/stat.dart'; -import '../../utils/id_utils.dart'; -import '../../utils/utils.dart'; -import '../constants.dart'; -import 'badge.dart'; -import 'network_img_layer.dart'; -import 'video_popup_menu.dart'; // 视频卡片 - 垂直布局 class VideoCardV extends StatelessWidget { diff --git a/lib/common/widgets/video_card_v_member_home.dart b/lib/common/widgets/video_card_v_member_home.dart index 0d9d5338c..2ab16b8bd 100644 --- a/lib/common/widgets/video_card_v_member_home.dart +++ b/lib/common/widgets/video_card_v_member_home.dart @@ -1,18 +1,18 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; -import '../../utils/utils.dart'; -import '../constants.dart'; -import 'badge.dart'; -import 'network_img_layer.dart'; // 视频卡片 - 垂直布局 class VideoCardVMemberHome extends StatelessWidget { - final Item videoItem; + final SpaceItem videoItem; const VideoCardVMemberHome({ super.key, @@ -102,7 +102,7 @@ class VideoCardVMemberHome extends StatelessWidget { } } -Widget videoContent(BuildContext context, Item videoItem) { +Widget videoContent(BuildContext context, SpaceItem videoItem) { return Expanded( child: Padding( padding: const EdgeInsets.fromLTRB(6, 5, 6, 5), diff --git a/lib/common/widgets/video_popup_menu.dart b/lib/common/widgets/video_popup_menu.dart index a250bea4e..067e7adb1 100644 --- a/lib/common/widgets/video_popup_menu.dart +++ b/lib/common/widgets/video_popup_menu.dart @@ -1,18 +1,17 @@ +import 'package:PiliPlus/http/user.dart'; +import 'package:PiliPlus/http/video.dart'; +import 'package:PiliPlus/models/home/rcmd/result.dart'; import 'package:PiliPlus/models/model_video.dart'; +import 'package:PiliPlus/models/space_archive/item.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import '../../http/user.dart'; -import '../../http/video.dart'; -import '../../models/home/rcmd/result.dart'; -import '../../pages/mine/controller.dart'; -import '../../utils/storage.dart'; -import 'package:PiliPlus/models/space_archive/item.dart'; - class VideoCustomAction { String title; String value; @@ -54,7 +53,7 @@ class VideoCustomActions { }, ), ], - if (videoItem is! Item) + if (videoItem is! SpaceArchiveItem) VideoCustomAction( '访问：${videoItem.owner.name}', 'visit', @@ -65,7 +64,7 @@ class VideoCustomActions { }); }, ), - if (videoItem is! Item) + if (videoItem is! SpaceArchiveItem) VideoCustomAction( '不感兴趣', 'dislike', Icon(MdiIcons.thumbDownOutline, size: 16), () async { @@ -234,7 +233,7 @@ class VideoCustomActions { ); } }), - if (videoItem is! Item) + if (videoItem is! SpaceArchiveItem) VideoCustomAction('拉黑：${videoItem.owner.name}', 'block', Icon(MdiIcons.cancel, size: 16), () async { await showDialog( diff --git a/lib/http/bangumi.dart b/lib/http/bangumi.dart index 833ebc691..657df4157 100644 --- a/lib/http/bangumi.dart +++ b/lib/http/bangumi.dart @@ -1,11 +1,11 @@ +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/bangumi/list.dart'; +import 'package:PiliPlus/models/bangumi/pgc_index/condition.dart'; import 'package:PiliPlus/models/bangumi/pgc_timeline/pgc_timeline.dart'; import 'package:PiliPlus/models/bangumi/pgc_timeline/result.dart'; -import '../models/bangumi/list.dart'; -import '../models/bangumi/pgc_index/condition.dart'; -import 'index.dart'; - class BangumiHttp { static Future pgcIndexResult({ required int page, @@ -46,7 +46,7 @@ class BangumiHttp { }, ); if (res.data['code'] == 0) { - return LoadingState.success(Condition.fromJson(res.data['data'])); + return LoadingState.success(PgcIndexCondition.fromJson(res.data['data'])); } else { return LoadingState.error(res.data['message']); } diff --git a/lib/http/black.dart b/lib/http/black.dart index eb02c8d80..1ad35468b 100644 --- a/lib/http/black.dart +++ b/lib/http/black.dart @@ -1,9 +1,9 @@ +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/user/black.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../models/user/black.dart'; -import 'index.dart'; - class BlackHttp { static Future> blackList( {required int pn, int? ps}) async { diff --git a/lib/http/common.dart b/lib/http/common.dart index 3e1b9f71b..e314cc362 100644 --- a/lib/http/common.dart +++ b/lib/http/common.dart @@ -1,4 +1,5 @@ -import 'index.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; class CommonHttp { static Future unReadDynamic() async { diff --git a/lib/http/danmaku.dart b/lib/http/danmaku.dart index 2727abd55..da3f09bd8 100644 --- a/lib/http/danmaku.dart +++ b/lib/http/danmaku.dart @@ -1,8 +1,9 @@ import 'package:PiliPlus/grpc/dm/v1/dm.pb.dart'; import 'package:PiliPlus/grpc/grpc_repo.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:dio/dio.dart'; -import 'index.dart'; class DanmakuHttp { // 获取视频弹幕 diff --git a/lib/http/danmaku_block.dart b/lib/http/danmaku_block.dart index 65d5bd469..8a1c91aaa 100644 --- a/lib/http/danmaku_block.dart +++ b/lib/http/danmaku_block.dart @@ -1,6 +1,7 @@ -import '../models/user/danmaku_block.dart'; -import '../utils/storage.dart'; -import 'index.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/user/danmaku_block.dart'; +import 'package:PiliPlus/utils/storage.dart'; class DanmakuFilterHttp { static Future danmakuFilter() async { diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart index 8b6c3cf8b..1c84add78 100644 --- a/lib/http/dynamics.dart +++ b/lib/http/dynamics.dart @@ -1,15 +1,15 @@ +import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/models/dynamics/up.dart'; +import 'package:PiliPlus/models/space_article/item.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; -import '../models/space_article/item.dart'; -import '../models/dynamics/result.dart'; -import '../models/dynamics/up.dart'; -import 'index.dart'; - class DynamicsHttp { static Future> followDynamic({ String? type, @@ -188,7 +188,8 @@ class DynamicsHttp { } } - static Future> articleView({required dynamic cvId}) async { + static Future> articleView( + {required dynamic cvId}) async { final res = await Request().get( Api.articleView, queryParameters: await WbiSign.makSign({ @@ -199,7 +200,7 @@ class DynamicsHttp { ); return res.data['code'] == 0 - ? LoadingState.success(Item.fromJson(res.data['data'])) + ? LoadingState.success(SpaceArticleItem.fromJson(res.data['data'])) : LoadingState.error(res.data['message']); } diff --git a/lib/http/fan.dart b/lib/http/fan.dart index 302c5bef9..98fe6df2c 100644 --- a/lib/http/fan.dart +++ b/lib/http/fan.dart @@ -1,7 +1,7 @@ +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; - -import '../models/fans/result.dart'; -import 'index.dart'; +import 'package:PiliPlus/models/fans/result.dart'; class FanHttp { static Future> fans( diff --git a/lib/http/follow.dart b/lib/http/follow.dart index 8b1566de1..a54ce2bab 100644 --- a/lib/http/follow.dart +++ b/lib/http/follow.dart @@ -1,7 +1,7 @@ +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; - -import '../models/follow/result.dart'; -import 'index.dart'; +import 'package:PiliPlus/models/follow/result.dart'; class FollowHttp { static Future followings({ diff --git a/lib/http/index.dart b/lib/http/index.dart deleted file mode 100644 index 84ff1d311..000000000 --- a/lib/http/index.dart +++ /dev/null @@ -1,2 +0,0 @@ -export 'api.dart'; -export 'init.dart'; diff --git a/lib/http/init.dart b/lib/http/init.dart index d656526f2..cf60335f5 100644 --- a/lib/http/init.dart +++ b/lib/http/init.dart @@ -2,18 +2,18 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'package:PiliPlus/build_config.dart'; +import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/retry_interceptor.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/accounts/account_manager/account_mgr.dart'; import 'package:PiliPlus/utils/global_data.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:archive/archive.dart'; import 'package:brotli/brotli.dart'; import 'package:dio/dio.dart'; import 'package:dio/io.dart'; import 'package:dio_http2_adapter/dio_http2_adapter.dart'; -import '../utils/storage.dart'; -import 'constants.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web; class Request { diff --git a/lib/http/live.dart b/lib/http/live.dart index 80cb7fa1f..89e60daa3 100644 --- a/lib/http/live.dart +++ b/lib/http/live.dart @@ -1,17 +1,17 @@ import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/live/danmu_info.dart'; import 'package:PiliPlus/models/live/follow.dart'; +import 'package:PiliPlus/models/live/item.dart'; import 'package:PiliPlus/models/live/live_emoticons/data.dart'; import 'package:PiliPlus/models/live/live_emoticons/datum.dart'; +import 'package:PiliPlus/models/live/room_info.dart'; +import 'package:PiliPlus/models/live/room_info_h5.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; -import '../models/live/item.dart'; -import '../models/live/room_info.dart'; -import '../models/live/room_info_h5.dart'; -import 'api.dart'; -import 'init.dart'; class LiveHttp { static Future?>> liveList({ diff --git a/lib/http/login.dart b/lib/http/login.dart index 072072a31..d31a5be79 100644 --- a/lib/http/login.dart +++ b/lib/http/login.dart @@ -1,13 +1,14 @@ import 'dart:convert'; +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/login/model.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; +import 'package:PiliPlus/utils/login_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:crypto/crypto.dart'; import 'package:dio/dio.dart'; import 'package:encrypt/encrypt.dart'; -import '../common/constants.dart'; -import '../models/login/index.dart'; -import '../utils/login_utils.dart'; -import '../utils/utils.dart'; -import 'index.dart'; class LoginHttp { static final String deviceId = LoginUtils.genDeviceId(); diff --git a/lib/http/member.dart b/lib/http/member.dart index bdc59b5b2..8910b7de7 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -3,32 +3,28 @@ import 'dart:io'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/grpc_repo.dart'; +import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/models/follow/result.dart'; +import 'package:PiliPlus/models/member/archive.dart'; +import 'package:PiliPlus/models/member/coin.dart'; +import 'package:PiliPlus/models/member/info.dart'; +import 'package:PiliPlus/models/member/seasons.dart'; +import 'package:PiliPlus/models/member/tags.dart'; import 'package:PiliPlus/models/space/data.dart'; -import 'package:PiliPlus/models/space_archive/data.dart' as space_archive; -import 'package:PiliPlus/models/space_article/data.dart' as space_article; -import 'package:PiliPlus/models/space/data.dart' as space_; +import 'package:PiliPlus/models/space_archive/data.dart'; +import 'package:PiliPlus/models/space_article/data.dart'; import 'package:PiliPlus/models/space_fav/space_fav.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' - show ContributeType; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import '../models/dynamics/result.dart'; -import '../models/follow/result.dart'; -import '../models/member/archive.dart'; -import '../models/member/coin.dart'; -import '../models/member/info.dart'; -import '../models/member/seasons.dart'; -import '../models/member/tags.dart'; -import '../models/space_archive/data.dart' as archive; -import '../models/space_article/data.dart' as article; -import '../utils/utils.dart'; -import '../utils/wbi_sign.dart'; -import 'index.dart'; - class MemberHttp { static Future reportMember( dynamic mid, { @@ -65,7 +61,7 @@ class MemberHttp { } } - static Future> spaceArticle({ + static Future> spaceArticle({ required int mid, required int page, }) async { @@ -92,7 +88,7 @@ class MemberHttp { ), ); if (res.data['code'] == 0) { - return LoadingState.success(article.Data.fromJson(res.data['data'])); + return LoadingState.success(SpaceArticleData.fromJson(res.data['data'])); } else { return LoadingState.error(res.data['message']); } @@ -147,7 +143,7 @@ class MemberHttp { } } - static Future> spaceArchive({ + static Future> spaceArchive({ required ContributeType type, required int? mid, String? aid, @@ -196,7 +192,7 @@ class MemberHttp { ), ); if (res.data['code'] == 0) { - return LoadingState.success(archive.Data.fromJson(res.data['data'])); + return LoadingState.success(SpaceArchiveData.fromJson(res.data['data'])); } else { return LoadingState.error(res.data['message']); } @@ -244,7 +240,7 @@ class MemberHttp { } } - static Future> space({ + static Future> space({ int? mid, dynamic fromViewAid, }) async { @@ -270,7 +266,7 @@ class MemberHttp { ), ); if (res.data['code'] == 0) { - return LoadingState.success(Data.fromJson(res.data['data'])); + return LoadingState.success(SpaceData.fromJson(res.data['data'])); } else { return LoadingState.error(res.data['message']); } diff --git a/lib/http/msg.dart b/lib/http/msg.dart index 578f3fd3f..685a7191a 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -1,22 +1,21 @@ import 'dart:math'; +import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/msg/account.dart'; import 'package:PiliPlus/models/msg/msgfeed_at_me.dart'; import 'package:PiliPlus/models/msg/msgfeed_like_me.dart'; import 'package:PiliPlus/models/msg/msgfeed_reply_me.dart'; import 'package:PiliPlus/models/msg/msgfeed_sys_msg.dart'; +import 'package:PiliPlus/models/msg/session.dart'; import 'package:PiliPlus/pages/dynamics/view.dart' show ReplyOption; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:uuid/uuid.dart'; -import '../models/msg/account.dart'; -import '../models/msg/session.dart'; -import '../utils/wbi_sign.dart'; -import 'api.dart'; -import 'init.dart'; - class MsgHttp { static Future> msgFeedReplyMe( {int cursor = -1, int cursorTime = -1}) async { diff --git a/lib/http/reply.dart b/lib/http/reply.dart index 051d76540..5e36738aa 100644 --- a/lib/http/reply.dart +++ b/lib/http/reply.dart @@ -1,18 +1,17 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/grpc/grpc_repo.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/video/reply/data.dart'; +import 'package:PiliPlus/models/video/reply/emote.dart'; import 'package:PiliPlus/models/video/reply/item.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:dio/dio.dart'; -import '../models/video/reply/data.dart'; -import '../models/video/reply/emote.dart'; -import 'api.dart'; -import 'init.dart'; - class ReplyHttp { static Options get _options => Options(extra: {'account': AnonymousAccount()}); diff --git a/lib/http/retry_interceptor.dart b/lib/http/retry_interceptor.dart index 1aa2385e4..4b1daa39a 100644 --- a/lib/http/retry_interceptor.dart +++ b/lib/http/retry_interceptor.dart @@ -1,7 +1,6 @@ +import 'package:PiliPlus/http/init.dart'; import 'package:dio/dio.dart'; -import 'index.dart'; - class RetryInterceptor extends Interceptor { final int _count; final int _delay; diff --git a/lib/http/search.dart b/lib/http/search.dart index 5fcd68cda..a00757370 100644 --- a/lib/http/search.dart +++ b/lib/http/search.dart @@ -1,15 +1,16 @@ import 'dart:convert'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/bangumi/info.dart'; +import 'package:PiliPlus/models/common/search_type.dart'; +import 'package:PiliPlus/models/search/result.dart'; import 'package:PiliPlus/models/search/search_trending/trending_data.dart'; +import 'package:PiliPlus/models/search/suggest.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import '../models/bangumi/info.dart'; -import '../models/common/search_type.dart'; -import '../models/search/result.dart'; -import '../models/search/suggest.dart'; -import '../utils/storage.dart'; -import 'index.dart'; class SearchHttp { // 获取搜索建议 diff --git a/lib/http/user.dart b/lib/http/user.dart index 9197da0d4..85a4b6b2d 100644 --- a/lib/http/user.dart +++ b/lib/http/user.dart @@ -1,4 +1,15 @@ +import 'package:PiliPlus/common/constants.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/model_hot_video_item.dart'; +import 'package:PiliPlus/models/user/fav_detail.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/models/user/history.dart'; +import 'package:PiliPlus/models/user/info.dart'; +import 'package:PiliPlus/models/user/stat.dart'; +import 'package:PiliPlus/models/user/sub_detail.dart'; +import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:PiliPlus/models/video/later.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -6,17 +17,6 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../common/constants.dart'; -import '../models/model_hot_video_item.dart'; -import '../models/user/fav_detail.dart'; -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'; class UserHttp { static Future userStat({required int mid}) async { diff --git a/lib/http/video.dart b/lib/http/video.dart index 6dfefeeda..7a26719fc 100644 --- a/lib/http/video.dart +++ b/lib/http/video.dart @@ -1,29 +1,29 @@ import 'dart:convert'; import 'dart:developer'; +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/grpc/app/card/v1/card.pb.dart' as card; import 'package:PiliPlus/grpc/grpc_repo.dart'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/login.dart'; import 'package:PiliPlus/models/bangumi/pgc_rank/pgc_rank_item_model.dart'; +import 'package:PiliPlus/models/common/reply_type.dart'; +import 'package:PiliPlus/models/home/rcmd/result.dart'; import 'package:PiliPlus/models/member/article.dart'; +import 'package:PiliPlus/models/model_hot_video_item.dart'; +import 'package:PiliPlus/models/model_rec_video_item.dart'; +import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/models/video/ai.dart'; +import 'package:PiliPlus/models/video/play/url.dart'; +import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; +import 'package:PiliPlus/utils/recommend_filter.dart'; +import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; import 'package:flutter/foundation.dart'; -import '../common/constants.dart'; -import '../models/common/reply_type.dart'; -import '../models/home/rcmd/result.dart'; -import '../models/model_hot_video_item.dart'; -import '../models/model_rec_video_item.dart'; -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/id_utils.dart'; -import '../utils/recommend_filter.dart'; -import '../utils/storage.dart'; -import '../utils/wbi_sign.dart'; -import 'api.dart'; -import 'init.dart'; -import 'login.dart'; /// view层根据 status 判断渲染逻辑 class VideoHttp { diff --git a/lib/main.dart b/lib/main.dart index 549cfb949..b5d49b476 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:PiliPlus/build_config.dart'; -import 'package:PiliPlus/pages/video/detail/view_v.dart'; +import 'package:PiliPlus/pages/video/view.dart'; import 'package:PiliPlus/utils/cache_manage.dart'; import 'package:PiliPlus/utils/theme_utils.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart'; diff --git a/lib/models/bangumi/pgc_index/condition.dart b/lib/models/bangumi/pgc_index/condition.dart index 5a39954e2..7b13e4adc 100644 --- a/lib/models/bangumi/pgc_index/condition.dart +++ b/lib/models/bangumi/pgc_index/condition.dart @@ -1,13 +1,13 @@ -class Condition { +class PgcIndexCondition { List? filter; List? order; - Condition({ + PgcIndexCondition({ this.filter, this.order, }); - Condition.fromJson(Map json) { + PgcIndexCondition.fromJson(Map json) { filter = (json['filter'] as List?) ?.map((item) => Filter.fromJson(item)) .toList(); diff --git a/lib/models/common/tab_type.dart b/lib/models/common/tab_type.dart index 12dc4004f..c4d9cbe4f 100644 --- a/lib/models/common/tab_type.dart +++ b/lib/models/common/tab_type.dart @@ -1,11 +1,15 @@ +import 'package:PiliPlus/pages/bangumi/controller.dart'; +import 'package:PiliPlus/pages/bangumi/view.dart'; +import 'package:PiliPlus/pages/hot/controller.dart'; +import 'package:PiliPlus/pages/hot/view.dart'; +import 'package:PiliPlus/pages/live/controller.dart'; import 'package:PiliPlus/pages/live/view.dart'; -import 'package:PiliPlus/pages/rank/index.dart'; +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:PiliPlus/pages/bangumi/index.dart'; -import 'package:PiliPlus/pages/hot/index.dart'; -import 'package:PiliPlus/pages/live/index.dart'; -import 'package:PiliPlus/pages/rcmd/index.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; enum TabType { live, rcmd, hot, rank, bangumi, cinema } diff --git a/lib/models/login/index.dart b/lib/models/login/model.dart similarity index 100% rename from lib/models/login/index.dart rename to lib/models/login/model.dart diff --git a/lib/models/space/archive.dart b/lib/models/space/archive.dart index cfab7ad23..caecb55a1 100644 --- a/lib/models/space/archive.dart +++ b/lib/models/space/archive.dart @@ -8,17 +8,17 @@ part 'archive.g.dart'; @JsonSerializable() class Archive { - @JsonKey(name: 'episodic_button') - EpisodicButton? episodicButton; - List? order; - int? count; - List? item; + @JsonKey(name: 'episodic_button') + EpisodicButton? episodicButton; + List? order; + int? count; + List? item; - Archive({this.episodicButton, this.order, this.count, this.item}); + Archive({this.episodicButton, this.order, this.count, this.item}); - factory Archive.fromJson(Map json) { - return _$ArchiveFromJson(json); - } + factory Archive.fromJson(Map json) { + return _$ArchiveFromJson(json); + } - Map toJson() => _$ArchiveToJson(this); + Map toJson() => _$ArchiveToJson(this); } diff --git a/lib/models/space/archive.g.dart b/lib/models/space/archive.g.dart index 3d05e26c5..49c1e273b 100644 --- a/lib/models/space/archive.g.dart +++ b/lib/models/space/archive.g.dart @@ -16,7 +16,7 @@ Archive _$ArchiveFromJson(Map json) => Archive( .toList(), count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((e) => Item.fromJson(e as Map)) + ?.map((e) => SpaceItem.fromJson(e as Map)) .toList(), ); diff --git a/lib/models/space/card.dart b/lib/models/space/card.dart index 78bceb44e..af9e1756b 100644 --- a/lib/models/space/card.dart +++ b/lib/models/space/card.dart @@ -19,7 +19,7 @@ import 'vip.dart'; part 'card.g.dart'; @JsonSerializable() -class Card { +class SpaceCard { Avatar? avatar; String? mid; String? name; @@ -89,7 +89,7 @@ class Card { @JsonKey(name: 'has_digital_asset') bool? hasDigitalAsset; - Card({ + SpaceCard({ this.avatar, this.mid, this.name, @@ -140,7 +140,7 @@ class Card { this.hasDigitalAsset, }); - factory Card.fromJson(Map json) => _$CardFromJson(json); + factory SpaceCard.fromJson(Map json) => _$CardFromJson(json); Map toJson() => _$CardToJson(this); } diff --git a/lib/models/space/card.g.dart b/lib/models/space/card.g.dart index 70f7af5eb..90f7cc4c3 100644 --- a/lib/models/space/card.g.dart +++ b/lib/models/space/card.g.dart @@ -6,7 +6,7 @@ part of 'card.dart'; // JsonSerializableGenerator // ************************************************************************** -Card _$CardFromJson(Map json) => Card( +SpaceCard _$CardFromJson(Map json) => SpaceCard( avatar: json['avatar'] == null ? null : Avatar.fromJson(json['avatar'] as Map), @@ -99,7 +99,7 @@ Card _$CardFromJson(Map json) => Card( hasDigitalAsset: json['has_digital_asset'] as bool?, ); -Map _$CardToJson(Card instance) => { +Map _$CardToJson(SpaceCard instance) => { 'avatar': instance.avatar, 'mid': instance.mid, 'name': instance.name, diff --git a/lib/models/space/coin_archive.dart b/lib/models/space/coin_archive.dart index 02bb44e75..1c8438f31 100644 --- a/lib/models/space/coin_archive.dart +++ b/lib/models/space/coin_archive.dart @@ -6,7 +6,7 @@ part 'coin_archive.g.dart'; @JsonSerializable() class CoinArchive { int? count; - List? item; + List? item; CoinArchive({this.count, this.item}); diff --git a/lib/models/space/coin_archive.g.dart b/lib/models/space/coin_archive.g.dart index ee834b661..bb21f7580 100644 --- a/lib/models/space/coin_archive.g.dart +++ b/lib/models/space/coin_archive.g.dart @@ -9,7 +9,7 @@ part of 'coin_archive.dart'; CoinArchive _$CoinArchiveFromJson(Map json) => CoinArchive( count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((json) => Item.fromJson(json)) + ?.map((json) => SpaceItem.fromJson(json)) .toList(), ); diff --git a/lib/models/space/data.dart b/lib/models/space/data.dart index ae26e6a83..e951aea7c 100644 --- a/lib/models/space/data.dart +++ b/lib/models/space/data.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/models/space_article/data.dart'; import 'package:json_annotation/json_annotation.dart'; import 'archive.dart'; @@ -13,12 +14,11 @@ import 'series.dart'; import 'setting.dart'; import 'tab.dart'; import 'tab2.dart'; -import 'package:PiliPlus/models/space_article/data.dart' as space; part 'data.g.dart'; @JsonSerializable() -class Data { +class SpaceData { int? relation; @JsonKey(name: 'rel_special') int? relSpecial; @@ -30,11 +30,11 @@ class Data { bool? isParams; Setting? setting; Tab? tab; - Card? card; - Images? images; + SpaceCard? card; + SpaceImages? images; Archive? archive; Series? series; - space.Data? article; + SpaceArticleData? article; Season? season; @JsonKey(name: 'coin_archive') CoinArchive? coinArchive; @@ -55,7 +55,7 @@ class Data { dynamic live; UgcSeason? ugcSeason; - Data({ + SpaceData({ this.relation, this.relSpecial, this.guestRelation, @@ -83,7 +83,7 @@ class Data { this.ugcSeason, }); - factory Data.fromJson(Map json) => _$DataFromJson(json); + factory SpaceData.fromJson(Map json) => _$DataFromJson(json); Map toJson() => _$DataToJson(this); } diff --git a/lib/models/space/data.g.dart b/lib/models/space/data.g.dart index ba1e21fcb..79fe9fcbd 100644 --- a/lib/models/space/data.g.dart +++ b/lib/models/space/data.g.dart @@ -6,7 +6,7 @@ part of 'data.dart'; // JsonSerializableGenerator // ************************************************************************** -Data _$DataFromJson(Map json) => Data( +SpaceData _$DataFromJson(Map json) => SpaceData( relation: (json['relation'] as num?)?.toInt(), relSpecial: (json['rel_special'] as num?)?.toInt(), guestRelation: (json['guest_relation'] as num?)?.toInt(), @@ -20,10 +20,10 @@ Data _$DataFromJson(Map json) => Data( : Tab.fromJson(json['tab'] as Map), card: json['card'] == null ? null - : Card.fromJson(json['card'] as Map), + : SpaceCard.fromJson(json['card'] as Map), images: json['images'] == null ? null - : Images.fromJson(json['images'] as Map), + : SpaceImages.fromJson(json['images'] as Map), archive: json['archive'] == null ? null : Archive.fromJson(json['archive'] as Map), @@ -32,7 +32,7 @@ Data _$DataFromJson(Map json) => Data( : Series.fromJson(json['series'] as Map), article: json['article'] == null ? null - : space.Data.fromJson(json['article'] as Map), + : SpaceArticleData.fromJson(json['article'] as Map), season: json['season'] == null ? null : Season.fromJson(json['season'] as Map), @@ -67,7 +67,7 @@ Data _$DataFromJson(Map json) => Data( : null, ); -Map _$DataToJson(Data instance) => { +Map _$DataToJson(SpaceData instance) => { 'relation': instance.relation, 'rel_special': instance.relSpecial, 'guest_relation': instance.guestRelation, diff --git a/lib/models/space/images.dart b/lib/models/space/images.dart index c3c5d5aab..ecd493956 100644 --- a/lib/models/space/images.dart +++ b/lib/models/space/images.dart @@ -7,37 +7,37 @@ import 'purchase_button.dart'; part 'images.g.dart'; @JsonSerializable() -class Images { - String? imgUrl; - @JsonKey(name: 'night_imgurl') - String? nightImgurl; - @JsonKey(name: 'has_garb') - bool? hasGarb; - @JsonKey(name: 'goods_available') - bool? goodsAvailable; - @JsonKey(name: 'purchase_button') - PurchaseButton? purchaseButton; - @JsonKey(name: 'entrance_button') - EntranceButton? entranceButton; - @JsonKey(name: 'digital_info') - DigitalInfo? digitalInfo; - @JsonKey(name: 'collection_top_simple') - dynamic collectionTopSimple; +class SpaceImages { + String? imgUrl; + @JsonKey(name: 'night_imgurl') + String? nightImgurl; + @JsonKey(name: 'has_garb') + bool? hasGarb; + @JsonKey(name: 'goods_available') + bool? goodsAvailable; + @JsonKey(name: 'purchase_button') + PurchaseButton? purchaseButton; + @JsonKey(name: 'entrance_button') + EntranceButton? entranceButton; + @JsonKey(name: 'digital_info') + DigitalInfo? digitalInfo; + @JsonKey(name: 'collection_top_simple') + dynamic collectionTopSimple; - Images({ - this.imgUrl, - this.nightImgurl, - this.hasGarb, - this.goodsAvailable, - this.purchaseButton, - this.entranceButton, - this.digitalInfo, - this.collectionTopSimple, - }); + SpaceImages({ + this.imgUrl, + this.nightImgurl, + this.hasGarb, + this.goodsAvailable, + this.purchaseButton, + this.entranceButton, + this.digitalInfo, + this.collectionTopSimple, + }); - factory Images.fromJson(Map json) { - return _$ImagesFromJson(json); - } + factory SpaceImages.fromJson(Map json) { + return _$ImagesFromJson(json); + } - Map toJson() => _$ImagesToJson(this); + Map toJson() => _$ImagesToJson(this); } diff --git a/lib/models/space/images.g.dart b/lib/models/space/images.g.dart index 7736b1dec..9151e9673 100644 --- a/lib/models/space/images.g.dart +++ b/lib/models/space/images.g.dart @@ -6,7 +6,7 @@ part of 'images.dart'; // JsonSerializableGenerator // ************************************************************************** -Images _$ImagesFromJson(Map json) => Images( +SpaceImages _$ImagesFromJson(Map json) => SpaceImages( imgUrl: json['imgUrl'] as String?, nightImgurl: json['night_imgurl'] as String?, hasGarb: json['has_garb'] as bool?, @@ -25,7 +25,7 @@ Images _$ImagesFromJson(Map json) => Images( collectionTopSimple: json['collection_top_simple'], ); -Map _$ImagesToJson(Images instance) => { +Map _$ImagesToJson(SpaceImages instance) => { 'imgUrl': instance.imgUrl, 'night_imgurl': instance.nightImgurl, 'has_garb': instance.hasGarb, diff --git a/lib/models/space/item.dart b/lib/models/space/item.dart index e24db96e6..47ac9c494 100644 --- a/lib/models/space/item.dart +++ b/lib/models/space/item.dart @@ -3,7 +3,7 @@ import 'package:json_annotation/json_annotation.dart'; part 'item.g.dart'; @JsonSerializable() -class Item { +class SpaceItem { String? title; String? subtitle; String? tname; @@ -57,7 +57,7 @@ class Item { @JsonKey(name: 'publish_time_text') String? publishTimeText; - Item({ + SpaceItem({ this.title, this.subtitle, this.tname, @@ -94,7 +94,7 @@ class Item { this.publishTimeText, }); - factory Item.fromJson(Map json) => _$ItemFromJson(json); + factory SpaceItem.fromJson(Map json) => _$ItemFromJson(json); Map toJson() => _$ItemToJson(this); } diff --git a/lib/models/space/item.g.dart b/lib/models/space/item.g.dart index 136961a55..11abbf26d 100644 --- a/lib/models/space/item.g.dart +++ b/lib/models/space/item.g.dart @@ -6,7 +6,7 @@ part of 'item.dart'; // JsonSerializableGenerator // ************************************************************************** -Item _$ItemFromJson(Map json) => Item( +SpaceItem _$ItemFromJson(Map json) => SpaceItem( title: json['title'] as String?, subtitle: json['subtitle'] as String?, tname: json['tname'] as String?, @@ -45,7 +45,7 @@ Item _$ItemFromJson(Map json) => Item( publishTimeText: json['publish_time_text'] as String?, ); -Map _$ItemToJson(Item instance) => { +Map _$ItemToJson(SpaceItem instance) => { 'title': instance.title, 'subtitle': instance.subtitle, 'tname': instance.tname, diff --git a/lib/models/space/like_archive.dart b/lib/models/space/like_archive.dart index 0b4c04f27..c9426feb5 100644 --- a/lib/models/space/like_archive.dart +++ b/lib/models/space/like_archive.dart @@ -6,7 +6,7 @@ part 'like_archive.g.dart'; @JsonSerializable() class LikeArchive { int? count; - List? item; + List? item; LikeArchive({this.count, this.item}); diff --git a/lib/models/space/like_archive.g.dart b/lib/models/space/like_archive.g.dart index cd111d219..285329c41 100644 --- a/lib/models/space/like_archive.g.dart +++ b/lib/models/space/like_archive.g.dart @@ -9,7 +9,7 @@ part of 'like_archive.dart'; LikeArchive _$LikeArchiveFromJson(Map json) => LikeArchive( count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((json) => Item.fromJson(json)) + ?.map((json) => SpaceItem.fromJson(json)) .toList(), ); diff --git a/lib/models/space/season.dart b/lib/models/space/season.dart index fa76c3ad2..7302d15af 100644 --- a/lib/models/space/season.dart +++ b/lib/models/space/season.dart @@ -6,7 +6,7 @@ part 'season.g.dart'; @JsonSerializable() class Season { int? count; - List? item; + List? item; Season({this.count, this.item}); diff --git a/lib/models/space/season.g.dart b/lib/models/space/season.g.dart index 4aa4de2e3..24a30bb25 100644 --- a/lib/models/space/season.g.dart +++ b/lib/models/space/season.g.dart @@ -9,7 +9,7 @@ part of 'season.dart'; Season _$SeasonFromJson(Map json) => Season( count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((e) => Item.fromJson(e as Map)) + ?.map((e) => SpaceArchiveItem.fromJson(e as Map)) .toList(), ); diff --git a/lib/models/space/space.dart b/lib/models/space/space.dart index 71de39b62..5452e76f9 100644 --- a/lib/models/space/space.dart +++ b/lib/models/space/space.dart @@ -6,14 +6,14 @@ part 'space.g.dart'; @JsonSerializable() class Space { - int? code; - String? message; - int? ttl; - Data? data; + int? code; + String? message; + int? ttl; + SpaceData? data; - Space({this.code, this.message, this.ttl, this.data}); + Space({this.code, this.message, this.ttl, this.data}); - factory Space.fromJson(Map json) => _$SpaceFromJson(json); + factory Space.fromJson(Map json) => _$SpaceFromJson(json); - Map toJson() => _$SpaceToJson(this); + Map toJson() => _$SpaceToJson(this); } diff --git a/lib/models/space/space.g.dart b/lib/models/space/space.g.dart index c00fc9a93..450a932ad 100644 --- a/lib/models/space/space.g.dart +++ b/lib/models/space/space.g.dart @@ -12,7 +12,7 @@ Space _$SpaceFromJson(Map json) => Space( ttl: (json['ttl'] as num?)?.toInt(), data: json['data'] == null ? null - : Data.fromJson(json['data'] as Map), + : SpaceData.fromJson(json['data'] as Map), ); Map _$SpaceToJson(Space instance) => { diff --git a/lib/models/space/tab2.dart b/lib/models/space/tab2.dart index 99b396fa2..f7c6321ac 100644 --- a/lib/models/space/tab2.dart +++ b/lib/models/space/tab2.dart @@ -6,13 +6,13 @@ part 'tab2.g.dart'; @JsonSerializable() class Tab2 { - String? title; - String? param; - List? items; + String? title; + String? param; + List? items; - Tab2({this.title, this.param, this.items}); + Tab2({this.title, this.param, this.items}); - factory Tab2.fromJson(Map json) => _$Tab2FromJson(json); + factory Tab2.fromJson(Map json) => _$Tab2FromJson(json); - Map toJson() => _$Tab2ToJson(this); + Map toJson() => _$Tab2ToJson(this); } diff --git a/lib/models/space/tab2.g.dart b/lib/models/space/tab2.g.dart index bdc906907..c7b9b5e27 100644 --- a/lib/models/space/tab2.g.dart +++ b/lib/models/space/tab2.g.dart @@ -10,7 +10,7 @@ Tab2 _$Tab2FromJson(Map json) => Tab2( title: json['title'] as String?, param: json['param'] as String?, items: (json['items'] as List?) - ?.map((e) => Item.fromJson(e as Map)) + ?.map((e) => SpaceItem.fromJson(e as Map)) .toList(), ); diff --git a/lib/models/space_archive/data.dart b/lib/models/space_archive/data.dart index 8c70ffa7d..da98a0aec 100644 --- a/lib/models/space_archive/data.dart +++ b/lib/models/space_archive/data.dart @@ -8,12 +8,12 @@ import 'order.dart'; part 'data.g.dart'; @JsonSerializable() -class Data { +class SpaceArchiveData { @JsonKey(name: 'episodic_button') EpisodicButton? episodicButton; List? order; int? count; - List? item; + List? item; @JsonKey(name: 'last_watched_locator') LastWatchedLocator? lastWatchedLocator; @JsonKey(name: 'has_next') @@ -22,7 +22,7 @@ class Data { bool? hasPrev; int? next; - Data({ + SpaceArchiveData({ this.episodicButton, this.order, this.count, @@ -33,7 +33,8 @@ class Data { this.next, }); - factory Data.fromJson(Map json) => _$DataFromJson(json); + factory SpaceArchiveData.fromJson(Map json) => + _$DataFromJson(json); Map toJson() => _$DataToJson(this); } diff --git a/lib/models/space_archive/data.g.dart b/lib/models/space_archive/data.g.dart index 70d1e33b4..b91a2b245 100644 --- a/lib/models/space_archive/data.g.dart +++ b/lib/models/space_archive/data.g.dart @@ -6,7 +6,7 @@ part of 'data.dart'; // JsonSerializableGenerator // ************************************************************************** -Data _$DataFromJson(Map json) => Data( +SpaceArchiveData _$DataFromJson(Map json) => SpaceArchiveData( episodicButton: json['episodic_button'] == null ? null : EpisodicButton.fromJson( @@ -16,7 +16,7 @@ Data _$DataFromJson(Map json) => Data( .toList(), count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((e) => Item.fromJson(e as Map)) + ?.map((e) => SpaceArchiveItem.fromJson(e as Map)) .toList(), lastWatchedLocator: json['last_watched_locator'] == null ? null @@ -27,7 +27,8 @@ Data _$DataFromJson(Map json) => Data( next: json['next'], ); -Map _$DataToJson(Data instance) => { +Map _$DataToJson(SpaceArchiveData instance) => + { 'episodic_button': instance.episodicButton, 'order': instance.order, 'count': instance.count, diff --git a/lib/models/space_archive/item.dart b/lib/models/space_archive/item.dart index 197bb1ef7..c75763c99 100644 --- a/lib/models/space_archive/item.dart +++ b/lib/models/space_archive/item.dart @@ -4,7 +4,7 @@ import 'badge.dart'; import 'cursor_attr.dart'; import 'three_point.dart'; -class Item extends BaseSimpleVideoItemModel { +class SpaceArchiveItem extends BaseSimpleVideoItemModel { String? subtitle; String? tname; String? get cover => pic; // 不知道哪里使用了cover @@ -34,7 +34,7 @@ class Item extends BaseSimpleVideoItemModel { Map? season; Map? history; - Item.fromJson(Map json) { + SpaceArchiveItem.fromJson(Map json) { title = json['title']; subtitle = json['subtitle']; tname = json['tname']; diff --git a/lib/models/space_archive/space_archive.dart b/lib/models/space_archive/space_archive.dart index f13a1f088..e3bf7d085 100644 --- a/lib/models/space_archive/space_archive.dart +++ b/lib/models/space_archive/space_archive.dart @@ -6,16 +6,16 @@ part 'space_archive.g.dart'; @JsonSerializable() class SpaceArchive { - int? code; - String? message; - int? ttl; - Data? data; + int? code; + String? message; + int? ttl; + SpaceArchiveData? data; - SpaceArchive({this.code, this.message, this.ttl, this.data}); + SpaceArchive({this.code, this.message, this.ttl, this.data}); - factory SpaceArchive.fromJson(Map json) { - return _$SpaceArchiveFromJson(json); - } + factory SpaceArchive.fromJson(Map json) { + return _$SpaceArchiveFromJson(json); + } - Map toJson() => _$SpaceArchiveToJson(this); + Map toJson() => _$SpaceArchiveToJson(this); } diff --git a/lib/models/space_archive/space_archive.g.dart b/lib/models/space_archive/space_archive.g.dart index b9f609a7f..4cfbf068c 100644 --- a/lib/models/space_archive/space_archive.g.dart +++ b/lib/models/space_archive/space_archive.g.dart @@ -12,7 +12,7 @@ SpaceArchive _$SpaceArchiveFromJson(Map json) => SpaceArchive( ttl: (json['ttl'] as num?)?.toInt(), data: json['data'] == null ? null - : Data.fromJson(json['data'] as Map), + : SpaceArchiveData.fromJson(json['data'] as Map), ); Map _$SpaceArchiveToJson(SpaceArchive instance) => diff --git a/lib/models/space_article/data.dart b/lib/models/space_article/data.dart index 698540cb2..999d8411b 100644 --- a/lib/models/space_article/data.dart +++ b/lib/models/space_article/data.dart @@ -6,16 +6,17 @@ import 'list.dart'; part 'data.g.dart'; @JsonSerializable() -class Data { +class SpaceArticleData { int? count; - List? item; + List? item; @JsonKey(name: 'lists_count') int? listsCount; List? lists; - Data({this.count, this.item, this.listsCount, this.lists}); + SpaceArticleData({this.count, this.item, this.listsCount, this.lists}); - factory Data.fromJson(Map json) => _$DataFromJson(json); + factory SpaceArticleData.fromJson(Map json) => + _$DataFromJson(json); Map toJson() => _$DataToJson(this); } diff --git a/lib/models/space_article/data.g.dart b/lib/models/space_article/data.g.dart index 161edccdd..9e356140c 100644 --- a/lib/models/space_article/data.g.dart +++ b/lib/models/space_article/data.g.dart @@ -6,10 +6,10 @@ part of 'data.dart'; // JsonSerializableGenerator // ************************************************************************** -Data _$DataFromJson(Map json) => Data( +SpaceArticleData _$DataFromJson(Map json) => SpaceArticleData( count: (json['count'] as num?)?.toInt(), item: (json['item'] as List?) - ?.map((item) => Item.fromJson(item)) + ?.map((item) => SpaceArticleItem.fromJson(item)) .toList(), listsCount: (json['lists_count'] as num?)?.toInt(), lists: (json['lists'] as List?) @@ -17,7 +17,8 @@ Data _$DataFromJson(Map json) => Data( .toList(), ); -Map _$DataToJson(Data instance) => { +Map _$DataToJson(SpaceArticleData instance) => + { 'count': instance.count, 'item': instance.item, 'lists_count': instance.listsCount, diff --git a/lib/models/space_article/item.dart b/lib/models/space_article/item.dart index d5aa57cb5..d4fb9e178 100644 --- a/lib/models/space_article/item.dart +++ b/lib/models/space_article/item.dart @@ -5,7 +5,7 @@ import 'category.dart'; import 'media.dart'; import 'stats.dart'; -class Item { +class SpaceArticleItem { int? id; Category? category; List? categories; @@ -56,7 +56,7 @@ class Item { String? dynIdStr; int? totalArtNum; - Item.fromJson(Map json) { + SpaceArticleItem.fromJson(Map json) { id = json["id"]; category = json["category"] == null ? null : Category.fromJson(json["category"]); diff --git a/lib/models/space_article/space_article.dart b/lib/models/space_article/space_article.dart index 5e9a0fd47..23a2fc7dd 100644 --- a/lib/models/space_article/space_article.dart +++ b/lib/models/space_article/space_article.dart @@ -6,16 +6,16 @@ part 'space_article.g.dart'; @JsonSerializable() class SpaceArticle { - int? code; - String? message; - int? ttl; - Data? data; + int? code; + String? message; + int? ttl; + SpaceArticleData? data; - SpaceArticle({this.code, this.message, this.ttl, this.data}); + SpaceArticle({this.code, this.message, this.ttl, this.data}); - factory SpaceArticle.fromJson(Map json) { - return _$SpaceArticleFromJson(json); - } + factory SpaceArticle.fromJson(Map json) { + return _$SpaceArticleFromJson(json); + } - Map toJson() => _$SpaceArticleToJson(this); + Map toJson() => _$SpaceArticleToJson(this); } diff --git a/lib/models/space_article/space_article.g.dart b/lib/models/space_article/space_article.g.dart index 0d4f4a330..747f01577 100644 --- a/lib/models/space_article/space_article.g.dart +++ b/lib/models/space_article/space_article.g.dart @@ -12,7 +12,7 @@ SpaceArticle _$SpaceArticleFromJson(Map json) => SpaceArticle( ttl: (json['ttl'] as num?)?.toInt(), data: json['data'] == null ? null - : Data.fromJson(json['data'] as Map), + : SpaceArticleData.fromJson(json['data'] as Map), ); Map _$SpaceArticleToJson(SpaceArticle instance) => diff --git a/lib/models/space_fav/datum.dart b/lib/models/space_fav/datum.dart index 233b9c25e..14f53b7df 100644 --- a/lib/models/space_fav/datum.dart +++ b/lib/models/space_fav/datum.dart @@ -5,15 +5,16 @@ import 'media_list_response.dart'; part 'datum.g.dart'; @JsonSerializable() -class Datum { - int? id; - String? name; - MediaListResponse? mediaListResponse; - String? uri; +class SpaceFavData { + int? id; + String? name; + MediaListResponse? mediaListResponse; + String? uri; - Datum({this.id, this.name, this.mediaListResponse, this.uri}); + SpaceFavData({this.id, this.name, this.mediaListResponse, this.uri}); - factory Datum.fromJson(Map json) => _$DatumFromJson(json); + factory SpaceFavData.fromJson(Map json) => + _$DatumFromJson(json); - Map toJson() => _$DatumToJson(this); + Map toJson() => _$DatumToJson(this); } diff --git a/lib/models/space_fav/datum.g.dart b/lib/models/space_fav/datum.g.dart index 4dc029d6a..9c1863956 100644 --- a/lib/models/space_fav/datum.g.dart +++ b/lib/models/space_fav/datum.g.dart @@ -6,7 +6,7 @@ part of 'datum.dart'; // JsonSerializableGenerator // ************************************************************************** -Datum _$DatumFromJson(Map json) => Datum( +SpaceFavData _$DatumFromJson(Map json) => SpaceFavData( id: (json['id'] as num?)?.toInt(), name: json['name'] as String?, mediaListResponse: json['mediaListResponse'] == null @@ -16,7 +16,7 @@ Datum _$DatumFromJson(Map json) => Datum( uri: json['uri'] as String?, ); -Map _$DatumToJson(Datum instance) => { +Map _$DatumToJson(SpaceFavData instance) => { 'id': instance.id, 'name': instance.name, 'mediaListResponse': instance.mediaListResponse, diff --git a/lib/models/space_fav/space_fav.dart b/lib/models/space_fav/space_fav.dart index da918a1ef..b954b0de2 100644 --- a/lib/models/space_fav/space_fav.dart +++ b/lib/models/space_fav/space_fav.dart @@ -6,16 +6,16 @@ part 'space_fav.g.dart'; @JsonSerializable() class SpaceFav { - int? code; - String? message; - int? ttl; - List? data; + int? code; + String? message; + int? ttl; + List? data; - SpaceFav({this.code, this.message, this.ttl, this.data}); + SpaceFav({this.code, this.message, this.ttl, this.data}); - factory SpaceFav.fromJson(Map json) { - return _$SpaceFavFromJson(json); - } + factory SpaceFav.fromJson(Map json) { + return _$SpaceFavFromJson(json); + } - Map toJson() => _$SpaceFavToJson(this); + Map toJson() => _$SpaceFavToJson(this); } diff --git a/lib/models/space_fav/space_fav.g.dart b/lib/models/space_fav/space_fav.g.dart index 0e137c8ee..a57d28486 100644 --- a/lib/models/space_fav/space_fav.g.dart +++ b/lib/models/space_fav/space_fav.g.dart @@ -11,7 +11,7 @@ SpaceFav _$SpaceFavFromJson(Map json) => SpaceFav( message: json['message'] as String?, ttl: (json['ttl'] as num?)?.toInt(), data: (json['data'] as List?) - ?.map((e) => Datum.fromJson(e as Map)) + ?.map((e) => SpaceFavData.fromJson(e as Map)) .toList(), ); diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 7df72d7ac..d26820358 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -3,8 +3,10 @@ import 'dart:io'; import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/common/widgets/dialog.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/services/loggeer.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; +import 'package:PiliPlus/utils/cache_manage.dart'; import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; @@ -15,8 +17,6 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart import 'package:package_info_plus/package_info_plus.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; -import '../../utils/cache_manage.dart'; -import '../mine/controller.dart'; class AboutPage extends StatefulWidget { const AboutPage({super.key, this.showAppBar}); diff --git a/lib/pages/article/controller.dart b/lib/pages/article/controller.dart index 44ec36deb..16a826fa5 100644 --- a/lib/pages/article/controller.dart +++ b/lib/pages/article/controller.dart @@ -36,7 +36,7 @@ class ArticleController extends ReplyController { final RxBool isLoaded = false.obs; DynamicItemModel? opusData; // 标题信息从summary获取, 动态没有favorite - Item? articleData; + SpaceArticleItem? articleData; final Rx stats = Rx(null); List? get opus => diff --git a/lib/pages/article/view.dart b/lib/pages/article/view.dart index 5c474a05b..2beff412f 100644 --- a/lib/pages/article/view.dart +++ b/lib/pages/article/view.dart @@ -2,6 +2,7 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/models/dynamics/result.dart' show DynamicStat; +import 'package:PiliPlus/pages/article/controller.dart'; import 'package:PiliPlus/pages/article/widgets/opus_content.dart'; import 'package:PiliPlus/pages/article/widgets/html_render.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; @@ -9,9 +10,11 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/reply_sort_type.dart'; -import 'package:PiliPlus/pages/dynamics/repost_dyn_panel.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/dynamics_repost/view.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/video/reply_reply/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -23,13 +26,9 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/skeleton/video_reply.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; -import 'package:PiliPlus/pages/video/detail/reply_reply/index.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:html/parser.dart' as parser; -import '../../utils/grid.dart'; -import 'controller.dart'; - class ArticlePage extends StatefulWidget { const ArticlePage({super.key}); diff --git a/lib/pages/article/widgets/html_render.dart b/lib/pages/article/widgets/html_render.dart index 09684826b..d7b917a80 100644 --- a/lib/pages/article/widgets/html_render.dart +++ b/lib/pages/article/widgets/html_render.dart @@ -1,11 +1,11 @@ import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' show SourceModel; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; -import '../../../common/widgets/network_img_layer.dart'; import 'package:html/dom.dart' as dom; Widget htmlRender({ diff --git a/lib/pages/bangumi/index.dart b/lib/pages/bangumi/index.dart deleted file mode 100644 index 0b514b745..000000000 --- a/lib/pages/bangumi/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library bangumi_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/bangumi/introduction/index.dart b/lib/pages/bangumi/introduction/index.dart deleted file mode 100644 index 40eab5b42..000000000 --- a/lib/pages/bangumi/introduction/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library bangumi_intro; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 79a5a567a..e919ff4a2 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -2,24 +2,23 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/loading_widget.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/bangumi/list.dart'; import 'package:PiliPlus/models/bangumi/pgc_timeline/result.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; -import 'package:PiliPlus/pages/bangumi/pgc_index/pgc_index_page.dart'; +import 'package:PiliPlus/pages/bangumi/controller.dart'; +import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v.dart'; +import 'package:PiliPlus/pages/pgc_index/view.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_timeline.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; -import '../../utils/grid.dart'; -import 'controller.dart'; -import 'widgets/bangumi_card_v.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; - class BangumiPage extends CommonPage { const BangumiPage({ super.key, diff --git a/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart b/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart index 467d0abca..554e99e22 100644 --- a/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart +++ b/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart @@ -13,7 +13,7 @@ class BangumiCardVMemberHome extends StatelessWidget { required this.bangumiItem, }); - final Item bangumiItem; + final SpaceArchiveItem bangumiItem; @override Widget build(BuildContext context) { @@ -62,7 +62,7 @@ class BangumiCardVMemberHome extends StatelessWidget { } } -Widget bangumiContent(Item bangumiItem) { +Widget bangumiContent(SpaceArchiveItem bangumiItem) { return Expanded( child: Padding( padding: const EdgeInsets.fromLTRB(4, 5, 0, 3), diff --git a/lib/pages/common/reply_controller.dart b/lib/pages/common/reply_controller.dart index 87a025328..f8c01211a 100644 --- a/lib/pages/common/reply_controller.dart +++ b/lib/pages/common/reply_controller.dart @@ -7,7 +7,7 @@ import 'package:PiliPlus/http/reply.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/models/video/reply/data.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/reply_page.dart'; +import 'package:PiliPlus/pages/video/reply_new/view.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/request_utils.dart'; diff --git a/lib/pages/contact/view.dart b/lib/pages/contact/view.dart index a2b9167ea..68533ac52 100644 --- a/lib/pages/contact/view.dart +++ b/lib/pages/contact/view.dart @@ -1,5 +1,5 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart'; -import 'package:PiliPlus/pages/fan/index.dart'; +import 'package:PiliPlus/pages/fan/view.dart'; import 'package:PiliPlus/pages/follow/child_view.dart'; import 'package:PiliPlus/pages/follow_search/view.dart'; import 'package:PiliPlus/pages/share/view.dart' show UserModel; diff --git a/lib/pages/danmaku/index.dart b/lib/pages/danmaku/index.dart deleted file mode 100644 index 004ee0c3e..000000000 --- a/lib/pages/danmaku/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library pldanmaku; - -export './controller.dart'; -export 'view.dart'; diff --git a/lib/pages/danmaku/view.dart b/lib/pages/danmaku/view.dart index 5ea632db8..dc02a49fb 100644 --- a/lib/pages/danmaku/view.dart +++ b/lib/pages/danmaku/view.dart @@ -2,12 +2,13 @@ import 'dart:async'; import 'dart:convert'; import 'package:PiliPlus/grpc/dm/v1/dm.pb.dart'; +import 'package:PiliPlus/pages/danmaku/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/danmaku/index.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:PiliPlus/utils/danmaku_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/danmaku_block/view.dart b/lib/pages/danmaku_block/view.dart index 27a88d607..8257887f5 100644 --- a/lib/pages/danmaku_block/view.dart +++ b/lib/pages/danmaku_block/view.dart @@ -1,11 +1,10 @@ import 'package:PiliPlus/models/user/danmaku_rule.dart'; import 'package:PiliPlus/pages/danmaku_block/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/utils/storage.dart'; - -import '../../plugin/pl_player/controller.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class DanmakuBlockPage extends StatefulWidget { diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index 650d54d03..f3d3a5b26 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -1,8 +1,10 @@ import 'dart:async'; import 'package:PiliPlus/http/follow.dart'; -import 'package:PiliPlus/pages/dynamics/tab/controller.dart'; -import 'package:PiliPlus/pages/dynamics/tab/view.dart'; +import 'package:PiliPlus/models/follow/result.dart'; +import 'package:PiliPlus/pages/common/common_controller.dart'; +import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; +import 'package:PiliPlus/pages/dynamics_tab/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -12,9 +14,6 @@ import 'package:PiliPlus/models/common/dynamics_type.dart'; import 'package:PiliPlus/models/dynamics/up.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../../models/follow/result.dart'; -import '../common/common_controller.dart'; - class DynamicsController extends GetxController with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin { @override diff --git a/lib/pages/dynamics/detail/index.dart b/lib/pages/dynamics/detail/index.dart deleted file mode 100644 index 8746d8aea..000000000 --- a/lib/pages/dynamics/detail/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library dynamic_detail; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/dynamics/index.dart b/lib/pages/dynamics/index.dart deleted file mode 100644 index 810610e16..000000000 --- a/lib/pages/dynamics/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library dynamics; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/dynamics/tab/index.dart b/lib/pages/dynamics/tab/index.dart deleted file mode 100644 index bd06e06a8..000000000 --- a/lib/pages/dynamics/tab/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library dynamics.tab; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart index e95e61518..4b6e8d8a8 100644 --- a/lib/pages/dynamics/view.dart +++ b/lib/pages/dynamics/view.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/models/common/dynamics_type.dart'; import 'package:PiliPlus/models/common/up_panel_position.dart'; -import 'package:PiliPlus/pages/dynamics/create_dyn_panel.dart'; +import 'package:PiliPlus/pages/dynamics_create/view.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart index edac42c6f..e6bc4b84a 100644 --- a/lib/pages/dynamics/widgets/action_panel.dart +++ b/lib/pages/dynamics/widgets/action_panel.dart @@ -1,4 +1,4 @@ -import 'package:PiliPlus/pages/dynamics/repost_dyn_panel.dart'; +import 'package:PiliPlus/pages/dynamics_repost/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/pages/dynamics/widgets/article_panel.dart b/lib/pages/dynamics/widgets/article_panel.dart index 03b6df286..da46bfb1c 100644 --- a/lib/pages/dynamics/widgets/article_panel.dart +++ b/lib/pages/dynamics/widgets/article_panel.dart @@ -1,10 +1,9 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/pic_panel.dart'; import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/utils.dart'; -import '../../../common/constants.dart'; -import 'pic_panel.dart'; - Widget articlePanel( ThemeData theme, String? source, diff --git a/lib/pages/dynamics/widgets/author_panel.dart b/lib/pages/dynamics/widgets/author_panel.dart index 61418a77e..873360979 100644 --- a/lib/pages/dynamics/widgets/author_panel.dart +++ b/lib/pages/dynamics/widgets/author_panel.dart @@ -2,9 +2,11 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/report.dart'; -import 'package:PiliPlus/common/widgets/save_panel.dart'; +import 'package:PiliPlus/pages/save_panel/view.dart'; +import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; @@ -17,9 +19,6 @@ import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/utils.dart'; -import '../../../http/constants.dart'; -import '../controller.dart'; - class AuthorPanel extends StatelessWidget { final DynamicItemModel item; final Function? addBannedList; diff --git a/lib/pages/dynamics/widgets/forward_panel.dart b/lib/pages/dynamics/widgets/forward_panel.dart index e2e91d27e..ff91125f5 100644 --- a/lib/pages/dynamics/widgets/forward_panel.dart +++ b/lib/pages/dynamics/widgets/forward_panel.dart @@ -3,7 +3,15 @@ import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; import 'package:PiliPlus/common/widgets/image_view.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; +import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/article/widgets/opus_content.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/additional_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/article_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/live_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/live_rcmd_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/pic_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/rich_node_panel.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/video_panel.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; @@ -11,15 +19,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/utils/utils.dart'; -import '../../../models/dynamics/result.dart'; -import 'additional_panel.dart'; -import 'article_panel.dart'; -import 'live_panel.dart'; -import 'live_rcmd_panel.dart'; -import 'pic_panel.dart'; -import 'rich_node_panel.dart'; -import 'video_panel.dart'; - InlineSpan picsNodes( List pics, Function(List, int)? callback, diff --git a/lib/pages/dynamics/create_dyn_panel.dart b/lib/pages/dynamics_create/view.dart similarity index 99% rename from lib/pages/dynamics/create_dyn_panel.dart rename to lib/pages/dynamics_create/view.dart index 3b8997fb8..ec6c95760 100644 --- a/lib/pages/dynamics/create_dyn_panel.dart +++ b/lib/pages/dynamics_create/view.dart @@ -3,7 +3,7 @@ import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/toolbar_icon_button.dart'; +import 'package:PiliPlus/common/widgets/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics_detail/controller.dart similarity index 100% rename from lib/pages/dynamics/detail/controller.dart rename to lib/pages/dynamics_detail/controller.dart diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics_detail/view.dart similarity index 98% rename from lib/pages/dynamics/detail/view.dart rename to lib/pages/dynamics_detail/view.dart index d2cc76ee6..a02712ce6 100644 --- a/lib/pages/dynamics/detail/view.dart +++ b/lib/pages/dynamics_detail/view.dart @@ -6,9 +6,13 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/reply_sort_type.dart'; -import 'package:PiliPlus/pages/dynamics/repost_dyn_panel.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; +import 'package:PiliPlus/pages/dynamics_detail/controller.dart'; +import 'package:PiliPlus/pages/dynamics_repost/view.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/video/reply_reply/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -22,14 +26,9 @@ import 'package:PiliPlus/common/skeleton/video_reply.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/pages/dynamics/detail/index.dart'; import 'package:PiliPlus/pages/dynamics/widgets/author_panel.dart'; -import 'package:PiliPlus/pages/video/detail/reply_reply/index.dart'; import 'package:PiliPlus/utils/feed_back.dart'; -import '../../../utils/grid.dart'; -import '../widgets/dynamic_panel.dart'; - class DynamicDetailPage extends StatefulWidget { const DynamicDetailPage({super.key}); diff --git a/lib/pages/dynamics/repost_dyn_panel.dart b/lib/pages/dynamics_repost/view.dart similarity index 99% rename from lib/pages/dynamics/repost_dyn_panel.dart rename to lib/pages/dynamics_repost/view.dart index ef41a3621..576125385 100644 --- a/lib/pages/dynamics/repost_dyn_panel.dart +++ b/lib/pages/dynamics_repost/view.dart @@ -4,7 +4,7 @@ import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/toolbar_icon_button.dart'; +import 'package:PiliPlus/common/widgets/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/dynamics/tab/controller.dart b/lib/pages/dynamics_tab/controller.dart similarity index 98% rename from lib/pages/dynamics/tab/controller.dart rename to lib/pages/dynamics_tab/controller.dart index 249278056..fefc0f6d6 100644 --- a/lib/pages/dynamics/tab/controller.dart +++ b/lib/pages/dynamics_tab/controller.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; @@ -7,8 +8,6 @@ import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import '../../../http/dynamics.dart'; - class DynamicsTabController extends CommonListController { DynamicsTabController({required this.dynamicsType}); diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics_tab/view.dart similarity index 96% rename from lib/pages/dynamics/tab/view.dart rename to lib/pages/dynamics_tab/view.dart index 67386870a..8e5ab67de 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics_tab/view.dart @@ -1,10 +1,15 @@ import 'dart:async'; +import 'package:PiliPlus/common/skeleton/dynamic_card.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; +import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; import 'package:PiliPlus/pages/main/controller.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -12,13 +17,6 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; -import '../../../common/skeleton/dynamic_card.dart'; -import '../../../utils/grid.dart'; - -import '../index.dart'; -import '../widgets/dynamic_panel.dart'; -import 'controller.dart'; - class DynamicsTabPage extends CommonPage { const DynamicsTabPage({super.key, required this.dynamicsType}); diff --git a/lib/pages/emote/controller.dart b/lib/pages/emote/controller.dart index d8dc6475f..a3f6473c3 100644 --- a/lib/pages/emote/controller.dart +++ b/lib/pages/emote/controller.dart @@ -1,11 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/http/reply.dart'; import 'package:PiliPlus/models/video/reply/emote.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../http/reply.dart'; - class EmotePanelController extends CommonListController?, Packages> with GetSingleTickerProviderStateMixin { diff --git a/lib/pages/emote/index.dart b/lib/pages/emote/index.dart deleted file mode 100644 index 32ce53e3c..000000000 --- a/lib/pages/emote/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library emote; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/emote/view.dart b/lib/pages/emote/view.dart index f6115bf8f..ffa34bfa0 100644 --- a/lib/pages/emote/view.dart +++ b/lib/pages/emote/view.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/common/widgets/loading_widget.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/video/reply/emote.dart'; +import 'package:PiliPlus/pages/emote/controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../common/widgets/network_img_layer.dart'; -import 'controller.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class EmotePanel extends StatefulWidget { diff --git a/lib/common/widgets/episode_panel.dart b/lib/pages/episode_panel/view.dart similarity index 99% rename from lib/common/widgets/episode_panel.dart rename to lib/pages/episode_panel/view.dart index 2bbfbbfc8..b865cc157 100644 --- a/lib/common/widgets/episode_panel.dart +++ b/lib/pages/episode_panel/view.dart @@ -13,9 +13,9 @@ import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/bangumi/info.dart' as bangumi; import 'package:PiliPlus/models/video_detail_res.dart' as video; import 'package:PiliPlus/pages/common/common_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/page.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/page.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/pages/fan/index.dart b/lib/pages/fan/index.dart deleted file mode 100644 index 84ac7b450..000000000 --- a/lib/pages/fan/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library fan; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart index 177cefaad..824ad8bd3 100644 --- a/lib/pages/fan/view.dart +++ b/lib/pages/fan/view.dart @@ -4,16 +4,15 @@ import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/fans/result.dart'; +import 'package:PiliPlus/pages/fan/controller.dart'; import 'package:PiliPlus/pages/share/view.dart' show UserModel; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; -import '../../utils/grid.dart'; -import 'controller.dart'; - class FansPage extends StatefulWidget { const FansPage({ super.key, diff --git a/lib/pages/fav/video/index.dart b/lib/pages/fav/video/index.dart deleted file mode 100644 index b77e006a8..000000000 --- a/lib/pages/fav/video/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library fav; - -export 'controller.dart'; -export 'view.dart'; diff --git a/lib/pages/fav/video/view.dart b/lib/pages/fav/video/view.dart index 5139ec7c0..a874940a6 100644 --- a/lib/pages/fav/video/view.dart +++ b/lib/pages/fav/video/view.dart @@ -1,17 +1,16 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/pages/fav/video/controller.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; -import 'package:PiliPlus/pages/fav/video/index.dart'; import 'package:PiliPlus/pages/fav/video/widgets/item.dart'; -import '../../../common/constants.dart'; -import '../../../utils/grid.dart'; - class FavVideoPage extends StatefulWidget { const FavVideoPage({super.key}); diff --git a/lib/pages/fav/view.dart b/lib/pages/fav/view.dart index 877869b3a..7db06c8cc 100644 --- a/lib/pages/fav/view.dart +++ b/lib/pages/fav/view.dart @@ -4,8 +4,9 @@ import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/fav/article/view.dart'; import 'package:PiliPlus/pages/fav/note/view.dart'; import 'package:PiliPlus/pages/fav/pgc/view.dart'; -import 'package:PiliPlus/pages/fav/video/fav_folder_sort_page.dart'; -import 'package:PiliPlus/pages/fav/video/index.dart'; +import 'package:PiliPlus/pages/fav/video/controller.dart'; +import 'package:PiliPlus/pages/fav_folder_sort/view.dart'; +import 'package:PiliPlus/pages/fav/video/view.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/video/detail/introduction/widgets/create_fav_page.dart b/lib/pages/fav_create/view.dart similarity index 100% rename from lib/pages/video/detail/introduction/widgets/create_fav_page.dart rename to lib/pages/fav_create/view.dart diff --git a/lib/pages/fav_detail/index.dart b/lib/pages/fav_detail/index.dart deleted file mode 100644 index dfeafac86..000000000 --- a/lib/pages/fav_detail/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library favdetail; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index ace2a65b9..221d7637d 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -1,11 +1,15 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/dialog.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/models/user/fav_detail.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/pages/fav_detail/fav_sort_page.dart'; +import 'package:PiliPlus/pages/fav_detail/controller.dart'; +import 'package:PiliPlus/pages/fav_sort/fav_sort_page.dart'; +import 'package:PiliPlus/pages/fav_detail/widget/fav_video_card.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -15,11 +19,6 @@ import 'package:get/get.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import 'package:PiliPlus/pages/fav_detail/index.dart'; - -import '../../common/constants.dart'; -import '../../utils/grid.dart'; -import 'widget/fav_video_card.dart'; class FavDetailPage extends StatefulWidget { const FavDetailPage({super.key}); diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart index aa2cd8be2..d1e84c817 100644 --- a/lib/pages/fav_detail/widget/fav_video_card.dart +++ b/lib/pages/fav_detail/widget/fav_video_card.dart @@ -1,3 +1,4 @@ +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/icon_button.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; @@ -13,7 +14,6 @@ import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import '../../../common/widgets/badge.dart'; // 收藏视频卡片 - 水平布局 class FavVideoCardH extends StatelessWidget { diff --git a/lib/pages/fav/video/fav_folder_sort_page.dart b/lib/pages/fav_folder_sort/view.dart similarity index 100% rename from lib/pages/fav/video/fav_folder_sort_page.dart rename to lib/pages/fav_folder_sort/view.dart diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/fav_panel/view.dart similarity index 99% rename from lib/pages/video/detail/introduction/widgets/fav_panel.dart rename to lib/pages/fav_panel/view.dart index 98c06cde6..b3f5b055f 100644 --- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart +++ b/lib/pages/fav_panel/view.dart @@ -1,11 +1,10 @@ import 'package:PiliPlus/models/user/fav_folder.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/utils/feed_back.dart'; -import '../../../../../utils/utils.dart'; - class FavPanel extends StatefulWidget { const FavPanel({ super.key, diff --git a/lib/pages/fav_detail/fav_sort_page.dart b/lib/pages/fav_sort/fav_sort_page.dart similarity index 100% rename from lib/pages/fav_detail/fav_sort_page.dart rename to lib/pages/fav_sort/fav_sort_page.dart diff --git a/lib/pages/follow/index.dart b/lib/pages/follow/index.dart deleted file mode 100644 index 9113361d8..000000000 --- a/lib/pages/follow/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library following; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/video/detail/introduction/widgets/group_panel.dart b/lib/pages/group_panel/group_panel.dart similarity index 100% rename from lib/pages/video/detail/introduction/widgets/group_panel.dart rename to lib/pages/group_panel/group_panel.dart diff --git a/lib/pages/history/index.dart b/lib/pages/history/index.dart deleted file mode 100644 index ff8fb6409..000000000 --- a/lib/pages/history/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library history; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/history/view.dart b/lib/pages/history/view.dart index 60bdcf5c5..9fd79ed55 100644 --- a/lib/pages/history/view.dart +++ b/lib/pages/history/view.dart @@ -1,18 +1,17 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/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/pages/history/base_controller.dart'; +import 'package:PiliPlus/pages/history/controller.dart'; +import 'package:PiliPlus/pages/history/widgets/item.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; -import 'package:PiliPlus/pages/history/index.dart'; - -import '../../common/constants.dart'; -import '../../utils/grid.dart'; -import 'widgets/item.dart'; class HistoryPage extends StatefulWidget { const HistoryPage({super.key, this.type}); diff --git a/lib/pages/home/controller.dart b/lib/pages/home/controller.dart index 2ec1d0b53..281ee6888 100644 --- a/lib/pages/home/controller.dart +++ b/lib/pages/home/controller.dart @@ -1,14 +1,15 @@ import 'dart:async'; import 'dart:math'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/pages/common/common_controller.dart'; +import 'package:PiliPlus/pages/mine/view.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../../http/index.dart'; -import '../../utils/feed_back.dart'; -import '../common/common_controller.dart'; -import '../mine/view.dart'; class HomeController extends GetxController with GetSingleTickerProviderStateMixin, ScrollOrRefreshMixin { diff --git a/lib/pages/home/index.dart b/lib/pages/home/index.dart deleted file mode 100644 index 2e6c5b1e5..000000000 --- a/lib/pages/home/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library home; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 5337e139c..7e107f52e 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; -import 'package:PiliPlus/pages/main/index.dart'; +import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/hot/index.dart b/lib/pages/hot/index.dart deleted file mode 100644 index 414776fa3..000000000 --- a/lib/pages/hot/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library hot; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/hot/view.dart b/lib/pages/hot/view.dart index 59cf3ae81..68417a883 100644 --- a/lib/pages/hot/view.dart +++ b/lib/pages/hot/view.dart @@ -4,7 +4,9 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/tab_type.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; +import 'package:PiliPlus/pages/home/controller.dart'; import 'package:PiliPlus/pages/rank/view.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; @@ -12,11 +14,8 @@ import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; -import 'package:PiliPlus/pages/home/index.dart'; import 'package:PiliPlus/pages/hot/controller.dart'; -import '../../utils/grid.dart'; - class HotPage extends CommonPage { const HotPage({super.key}); diff --git a/lib/pages/later/index.dart b/lib/pages/later/index.dart deleted file mode 100644 index 3c4fefd94..000000000 --- a/lib/pages/later/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library later; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/live/index.dart b/lib/pages/live/index.dart deleted file mode 100644 index 2e560f116..000000000 --- a/lib/pages/live/index.dart +++ /dev/null @@ -1,3 +0,0 @@ -library live; - -export './controller.dart'; diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index ba33d54d1..e5c2a6e84 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -8,6 +8,7 @@ import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/live/controller.dart'; import 'package:PiliPlus/pages/live/widgets/live_item.dart'; import 'package:PiliPlus/pages/live/widgets/live_item_follow.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -15,8 +16,6 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_v.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; -import '../../utils/grid.dart'; - class LivePage extends CommonPage { const LivePage({super.key}); diff --git a/lib/pages/live_emote/index.dart b/lib/pages/live_emote/index.dart deleted file mode 100644 index 4bd3ddbbf..000000000 --- a/lib/pages/live_emote/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library emote; - -export 'controller.dart'; -export 'view.dart'; diff --git a/lib/pages/live_emote/view.dart b/lib/pages/live_emote/view.dart index b482eb222..4fc3452f5 100644 --- a/lib/pages/live_emote/view.dart +++ b/lib/pages/live_emote/view.dart @@ -1,14 +1,14 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/loading_widget.dart'; +import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/live/live_emoticons/datum.dart'; import 'package:PiliPlus/models/live/live_emoticons/emoticon.dart'; +import 'package:PiliPlus/pages/live_emote/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../common/widgets/network_img_layer.dart'; -import 'controller.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; class LiveEmotePanel extends StatefulWidget { diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 641f652ea..10cdd460f 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -3,11 +3,15 @@ import 'dart:convert'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/live/danmu_info.dart'; import 'package:PiliPlus/models/live/quality.dart'; +import 'package:PiliPlus/models/live/room_info_h5.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/data_source.dart'; import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/tcp/live.dart'; import 'package:PiliPlus/utils/danmaku_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/utils/video_utils.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; @@ -16,9 +20,6 @@ import 'package:get/get.dart'; import 'package:PiliPlus/http/constants.dart'; import 'package:PiliPlus/http/live.dart'; import 'package:PiliPlus/models/live/room_info.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; -import '../../models/live/room_info_h5.dart'; -import '../../utils/video_utils.dart'; class LiveRoomController extends GetxController { LiveRoomController(this.heroTag); diff --git a/lib/pages/live_room/index.dart b/lib/pages/live_room/index.dart deleted file mode 100644 index ce4bea9f9..000000000 --- a/lib/pages/live_room/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library liveroom; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/live_room/send_dm_panel.dart b/lib/pages/live_room/send_danmaku/view.dart similarity index 98% rename from lib/pages/live_room/send_dm_panel.dart rename to lib/pages/live_room/send_danmaku/view.dart index 5df34d3cd..53326e1f0 100644 --- a/lib/pages/live_room/send_dm_panel.dart +++ b/lib/pages/live_room/send_danmaku/view.dart @@ -5,7 +5,7 @@ import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/live_emote/controller.dart'; import 'package:PiliPlus/pages/live_emote/view.dart'; import 'package:PiliPlus/pages/live_room/controller.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/toolbar_icon_button.dart'; +import 'package:PiliPlus/common/widgets/toolbar_icon_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index e9997f115..f1433c213 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -3,12 +3,18 @@ import 'dart:io'; import 'dart:ui'; import 'package:PiliPlus/models/live/room_info_h5.dart'; -import 'package:PiliPlus/pages/live_room/send_dm_panel.dart'; +import 'package:PiliPlus/pages/live_room/controller.dart'; +import 'package:PiliPlus/pages/live_room/send_danmaku/view.dart'; +import 'package:PiliPlus/pages/live_room/widgets/bottom_control.dart'; import 'package:PiliPlus/pages/live_room/widgets/chat.dart'; import 'package:PiliPlus/pages/live_room/widgets/header_control.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; +import 'package:PiliPlus/plugin/pl_player/view.dart'; import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; @@ -18,13 +24,8 @@ import 'package:flutter/services.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:screen_brightness/screen_brightness.dart'; -import '../../utils/storage.dart'; -import 'controller.dart'; -import 'widgets/bottom_control.dart'; - class LiveRoomPage extends StatefulWidget { const LiveRoomPage({super.key}); diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart index 5a25a5c42..bbf9d7df1 100644 --- a/lib/pages/live_room/widgets/bottom_control.dart +++ b/lib/pages/live_room/widgets/bottom_control.dart @@ -1,8 +1,9 @@ +import 'package:PiliPlus/pages/live_room/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/common_btn.dart'; import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/pages/live_room/index.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:get/get.dart'; class BottomControl extends StatelessWidget implements PreferredSizeWidget { diff --git a/lib/pages/live_room/widgets/header_control.dart b/lib/pages/live_room/widgets/header_control.dart index af22a4fcb..3d6a752ee 100644 --- a/lib/pages/live_room/widgets/header_control.dart +++ b/lib/pages/live_room/widgets/header_control.dart @@ -1,9 +1,9 @@ import 'dart:io'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:floating/floating.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:get/get.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart index c519b4538..2769a6f37 100644 --- a/lib/pages/login/controller.dart +++ b/lib/pages/login/controller.dart @@ -13,7 +13,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/http/login.dart'; import 'package:gt3_flutter_plugin/gt3_flutter_plugin.dart'; -import 'package:PiliPlus/models/login/index.dart'; +import 'package:PiliPlus/models/login/model.dart'; class LoginPageController extends GetxController with GetSingleTickerProviderStateMixin { diff --git a/lib/pages/login/index.dart b/lib/pages/login/index.dart deleted file mode 100644 index cdc05abdd..000000000 --- a/lib/pages/login/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library login; - -export './controller.dart'; -export 'view.dart'; diff --git a/lib/pages/main/controller.dart b/lib/pages/main/controller.dart index 0d8a07e39..354eb4ff5 100644 --- a/lib/pages/main/controller.dart +++ b/lib/pages/main/controller.dart @@ -3,6 +3,8 @@ import 'dart:async'; import 'package:PiliPlus/grpc/grpc_repo.dart'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; +import 'package:PiliPlus/models/common/nav_bar_config.dart'; import 'package:PiliPlus/pages/dynamics/view.dart'; import 'package:PiliPlus/pages/home/view.dart'; import 'package:PiliPlus/pages/media/view.dart'; @@ -11,8 +13,6 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../../models/common/dynamic_badge_mode.dart'; -import '../../models/common/nav_bar_config.dart'; class MainController extends GetxController { List pages = []; diff --git a/lib/pages/main/index.dart b/lib/pages/main/index.dart deleted file mode 100644 index b61d2ad2a..000000000 --- a/lib/pages/main/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library main; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart index a053825c2..144c322bd 100644 --- a/lib/pages/main/view.dart +++ b/lib/pages/main/view.dart @@ -2,6 +2,11 @@ import 'dart:io'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/tabs.dart'; +import 'package:PiliPlus/pages/dynamics/controller.dart'; +import 'package:PiliPlus/pages/dynamics/view.dart'; +import 'package:PiliPlus/pages/home/controller.dart'; +import 'package:PiliPlus/pages/home/view.dart'; +import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/extension.dart'; @@ -11,13 +16,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/common/dynamic_badge_mode.dart'; -import 'package:PiliPlus/pages/dynamics/index.dart'; -import 'package:PiliPlus/pages/home/index.dart'; import 'package:PiliPlus/utils/event_bus.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import './controller.dart'; import 'package:stream_transform/stream_transform.dart'; class MainApp extends StatefulWidget { diff --git a/lib/pages/media/index.dart b/lib/pages/media/index.dart deleted file mode 100644 index 8fae48913..000000000 --- a/lib/pages/media/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library media; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index 3a5c49805..b39540866 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -3,12 +3,12 @@ import 'dart:async'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; import 'package:PiliPlus/pages/main/controller.dart'; +import 'package:PiliPlus/pages/media/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/pages/media/index.dart'; import 'package:PiliPlus/utils/utils.dart'; class MediaPage extends CommonPage { diff --git a/lib/pages/member/controller.dart b/lib/pages/member/controller.dart index ccd682caf..e788a023f 100644 --- a/lib/pages/member/controller.dart +++ b/lib/pages/member/controller.dart @@ -21,7 +21,7 @@ extension MemberTabTypeExt on MemberTabType { String get title => ['默认', '首页', '动态', '投稿', '收藏', '番剧'][index]; } -class MemberControllerNew extends CommonDataController +class MemberControllerNew extends CommonDataController with GetTickerProviderStateMixin { MemberControllerNew({required this.mid}); int mid; @@ -61,8 +61,8 @@ class MemberControllerNew extends CommonDataController } @override - bool customHandleResponse(bool isRefresh, Success response) { - Data data = response.response; + bool customHandleResponse(bool isRefresh, Success response) { + SpaceData data = response.response; username = data.card?.name ?? ''; isFollowed = data.card?.relation?.isFollowed; if (data.relation == -1) { @@ -133,7 +133,7 @@ class MemberControllerNew extends CommonDataController Tab2( title: '投稿', param: 'contribute', - items: [Item(title: '视频', param: 'video')], + items: [SpaceItem(title: '视频', param: 'video')], ), Tab2(title: '收藏', param: 'favorite'), Tab2(title: '追番', param: 'bangumi'), @@ -151,7 +151,7 @@ class MemberControllerNew extends CommonDataController } @override - Future> customGetData() => MemberHttp.space( + Future> customGetData() => MemberHttp.space( mid: mid, fromViewAid: fromViewAid, ); diff --git a/lib/pages/member/member_page.dart b/lib/pages/member/view.dart similarity index 95% rename from lib/pages/member/member_page.dart rename to lib/pages/member/view.dart index 7ed2c0dd8..68c4c3db8 100644 --- a/lib/pages/member/member_page.dart +++ b/lib/pages/member/view.dart @@ -4,10 +4,10 @@ import 'package:PiliPlus/common/widgets/radio_widget.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; import 'package:PiliPlus/models/space/data.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/favorite/member_favorite.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart'; -import 'package:PiliPlus/pages/member/content/member_home/member_home.dart'; +import 'package:PiliPlus/pages/member_pgc/view.dart'; +import 'package:PiliPlus/pages/member_favorite/view.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart'; +import 'package:PiliPlus/pages/member_home/view.dart'; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/pages/member/widget/user_info_card.dart'; import 'package:PiliPlus/pages/member_dynamics/view.dart'; @@ -19,14 +19,14 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/scroll_physics.dart'; -class MemberPageNew extends StatefulWidget { - const MemberPageNew({super.key}); +class MemberPage extends StatefulWidget { + const MemberPage({super.key}); @override - State createState() => _MemberPageNewState(); + State createState() => _MemberPageState(); } -class _MemberPageNewState extends State { +class _MemberPageState extends State { late final int _mid; late final String _heroTag; late final MemberControllerNew _userController; @@ -271,7 +271,7 @@ class _MemberPageNewState extends State { Widget _buildUserInfo(LoadingState userState, [bool isV = true]) { return switch (userState) { Loading() => const CircularProgressIndicator(), - Success() => userState.response is Data + Success() => userState.response is SpaceData ? Obx( () => UserInfoCard( isV: isV, diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart index 027720e41..72b29df31 100644 --- a/lib/pages/member/widget/user_info_card.dart +++ b/lib/pages/member/widget/user_info_card.dart @@ -2,8 +2,8 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' show SourceModel; -import 'package:PiliPlus/models/space/card.dart' as space; -import 'package:PiliPlus/models/space/images.dart' as space; +import 'package:PiliPlus/models/space/card.dart'; +import 'package:PiliPlus/models/space/images.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -29,8 +29,8 @@ class UserInfoCard extends StatelessWidget { final bool isV; final bool isOwner; final int relation; - final space.Card card; - final space.Images images; + final SpaceCard card; + final SpaceImages images; final VoidCallback onFollow; final dynamic live; final int? silence; diff --git a/lib/pages/member/content/member_contribute/content/article/member_article_ctr.dart b/lib/pages/member_article/controller.dart similarity index 70% rename from lib/pages/member/content/member_contribute/content/article/member_article_ctr.dart rename to lib/pages/member_article/controller.dart index 8707ef492..12ae24196 100644 --- a/lib/pages/member/content/member_contribute/content/article/member_article_ctr.dart +++ b/lib/pages/member_article/controller.dart @@ -4,7 +4,8 @@ import 'package:PiliPlus/models/space_article/item.dart'; import 'package:PiliPlus/models/space_article/data.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -class MemberArticleCtr extends CommonListController { +class MemberArticleCtr + extends CommonListController { MemberArticleCtr({ required this.mid, }); @@ -20,7 +21,7 @@ class MemberArticleCtr extends CommonListController { } @override - List? getDataList(Data response) { + List? getDataList(SpaceArticleData response) { return response.item; } @@ -32,12 +33,13 @@ class MemberArticleCtr extends CommonListController { } @override - bool customHandleResponse(bool isRefresh, Success response) { + bool customHandleResponse( + bool isRefresh, Success response) { count = response.response.count ?? -1; return false; } @override - Future> customGetData() => + Future> customGetData() => MemberHttp.spaceArticle(mid: mid, page: currentPage); } diff --git a/lib/pages/member/content/member_contribute/content/article/member_article.dart b/lib/pages/member_article/view.dart similarity index 90% rename from lib/pages/member/content/member_contribute/content/article/member_article.dart rename to lib/pages/member_article/view.dart index 595598811..170a74b4c 100644 --- a/lib/pages/member/content/member_contribute/content/article/member_article.dart +++ b/lib/pages/member_article/view.dart @@ -2,8 +2,8 @@ import 'package:PiliPlus/common/widgets/loading_widget.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space_article/item.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/article/member_article_ctr.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/article/widget/item.dart'; +import 'package:PiliPlus/pages/member_article/controller.dart'; +import 'package:PiliPlus/pages/member_article/widget/item.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -38,7 +38,7 @@ class _MemberArticleState extends State return Obx(() => _buildBody(_controller.loadingState.value)); } - _buildBody(LoadingState?> loadingState) { + _buildBody(LoadingState?> loadingState) { return switch (loadingState) { Loading() => loadingWidget, Success() => loadingState.response?.isNotEmpty == true diff --git a/lib/pages/member/content/member_contribute/content/article/widget/item.dart b/lib/pages/member_article/widget/item.dart similarity index 99% rename from lib/pages/member/content/member_contribute/content/article/widget/item.dart rename to lib/pages/member_article/widget/item.dart index 67910b5d9..facd22bb3 100644 --- a/lib/pages/member/content/member_contribute/content/article/widget/item.dart +++ b/lib/pages/member_article/widget/item.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; class MemberArticleItem extends StatelessWidget { const MemberArticleItem({super.key, required this.item}); - final Item item; + final SpaceArticleItem item; @override Widget build(BuildContext context) { diff --git a/lib/pages/member/content/member_contribute/content/audio/member_audio.dart b/lib/pages/member_audio/view.dart similarity index 100% rename from lib/pages/member/content/member_contribute/content/audio/member_audio.dart rename to lib/pages/member_audio/view.dart diff --git a/lib/pages/member_coin/index.dart b/lib/pages/member_coin/index.dart deleted file mode 100644 index 3009dd2b9..000000000 --- a/lib/pages/member_coin/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library member_coin; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/member/content/member_contribute/member_contribute_ctr.dart b/lib/pages/member_contribute/controller.dart similarity index 94% rename from lib/pages/member/content/member_contribute/member_contribute_ctr.dart rename to lib/pages/member_contribute/controller.dart index f2983b035..7130643ee 100644 --- a/lib/pages/member/content/member_contribute/member_contribute_ctr.dart +++ b/lib/pages/member_contribute/controller.dart @@ -1,6 +1,7 @@ import 'dart:math'; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/models/space/tab2.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; import 'package:PiliPlus/pages/member/controller.dart'; @@ -8,8 +9,6 @@ import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../../../models/space/item.dart'; - class MemberContributeCtr extends CommonDataController with GetSingleTickerProviderStateMixin { MemberContributeCtr({ @@ -22,7 +21,7 @@ class MemberContributeCtr extends CommonDataController TabController? tabController; List? tabs; late final _ctr = Get.find(tag: heroTag); - List? items; + List? items; @override void onInit() { @@ -35,7 +34,7 @@ class MemberContributeCtr extends CommonDataController // show if exist if (_ctr.hasSeasonOrSeries == true) { items!.add( - Item( + SpaceItem( param: 'ugcSeason', title: '全部合集/列表', ), diff --git a/lib/pages/member/content/member_contribute/member_contribute.dart b/lib/pages/member_contribute/view.dart similarity index 88% rename from lib/pages/member/content/member_contribute/member_contribute.dart rename to lib/pages/member_contribute/view.dart index 1bfebc0ab..75968bea4 100644 --- a/lib/pages/member/content/member_contribute/member_contribute.dart +++ b/lib/pages/member_contribute/view.dart @@ -1,8 +1,8 @@ -import 'package:PiliPlus/pages/member/content/member_contribute/content/article/member_article.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/audio/member_audio.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/season_series/season_series_page.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/video/member_video.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute_ctr.dart'; +import 'package:PiliPlus/pages/member_article/view.dart'; +import 'package:PiliPlus/pages/member_audio/view.dart'; +import 'package:PiliPlus/pages/member_season_series/view.dart'; +import 'package:PiliPlus/pages/member_video/view.dart'; +import 'package:PiliPlus/pages/member_contribute/controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/member_dynamics/index.dart b/lib/pages/member_dynamics/index.dart deleted file mode 100644 index 529519090..000000000 --- a/lib/pages/member_dynamics/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library member_dynamics; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/member_dynamics/view.dart b/lib/pages/member_dynamics/view.dart index 41126caf7..1a1d91c3e 100644 --- a/lib/pages/member_dynamics/view.dart +++ b/lib/pages/member_dynamics/view.dart @@ -1,17 +1,16 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/dynamic_card.dart'; +import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; +import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; +import 'package:PiliPlus/pages/member_dynamics/controller.dart'; +import 'package:PiliPlus/utils/grid.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/member_dynamics/index.dart'; import 'package:PiliPlus/utils/utils.dart'; - -import '../../common/constants.dart'; -import '../../common/widgets/http_error.dart'; -import '../../utils/grid.dart'; -import '../../utils/storage.dart'; -import '../dynamics/widgets/dynamic_panel.dart'; import 'package:waterfall_flow/waterfall_flow.dart'; class MemberDynamicsPage extends StatefulWidget { diff --git a/lib/pages/member/content/member_contribute/content/favorite/member_favorite_ctr.dart b/lib/pages/member_favorite/controller.dart similarity index 95% rename from lib/pages/member/content/member_contribute/content/favorite/member_favorite_ctr.dart rename to lib/pages/member_favorite/controller.dart index 2a7670825..214f14cfe 100644 --- a/lib/pages/member/content/member_contribute/content/favorite/member_favorite_ctr.dart +++ b/lib/pages/member_favorite/controller.dart @@ -16,8 +16,8 @@ class MemberFavoriteCtr extends CommonDataController { final int mid; - Rx first = Datum().obs; - Rx second = Datum().obs; + Rx first = SpaceFavData().obs; + Rx second = SpaceFavData().obs; RxBool firstEnd = true.obs; RxBool secondEnd = true.obs; @@ -41,7 +41,7 @@ class MemberFavoriteCtr extends CommonDataController { @override bool customHandleResponse(bool isRefresh, Success response) { try { - List res = response.response; + List res = response.response; first.value = res.first; second.value = res[1]; diff --git a/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart b/lib/pages/member_favorite/view.dart similarity index 94% rename from lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart rename to lib/pages/member_favorite/view.dart index 6961e29cf..f1116e636 100644 --- a/lib/pages/member/content/member_contribute/content/favorite/member_favorite.dart +++ b/lib/pages/member_favorite/view.dart @@ -3,8 +3,8 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space_fav/datum.dart'; import 'package:PiliPlus/models/space_fav/list.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/favorite/member_favorite_ctr.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/favorite/widget/item.dart'; +import 'package:PiliPlus/pages/member_favorite/controller.dart'; +import 'package:PiliPlus/pages/member_favorite/widget/item.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -77,7 +77,7 @@ class _MemberFavoriteState extends State }; } - _buildItem(ThemeData theme, Datum data, bool isFirst) { + _buildItem(ThemeData theme, SpaceFavData data, bool isFirst) { return Theme( data: theme.copyWith( dividerColor: Colors.transparent, diff --git a/lib/pages/member/content/member_contribute/content/favorite/widget/item.dart b/lib/pages/member_favorite/widget/item.dart similarity index 100% rename from lib/pages/member/content/member_contribute/content/favorite/widget/item.dart rename to lib/pages/member_favorite/widget/item.dart diff --git a/lib/pages/member/content/member_home/member_home.dart b/lib/pages/member_home/view.dart similarity index 96% rename from lib/pages/member/content/member_home/member_home.dart rename to lib/pages/member_home/view.dart index 424eb94fd..99f1b40ae 100644 --- a/lib/pages/member/content/member_home/member_home.dart +++ b/lib/pages/member_home/view.dart @@ -7,12 +7,12 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space/data.dart'; import 'package:PiliPlus/models/space/item.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_member_home.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/article/widget/item.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute_ctr.dart'; -import 'package:PiliPlus/pages/member/content/member_home/widget/fav_item.dart'; +import 'package:PiliPlus/pages/member_article/widget/item.dart'; +import 'package:PiliPlus/pages/member_coin/view.dart'; +import 'package:PiliPlus/pages/member_contribute/controller.dart'; +import 'package:PiliPlus/pages/member_home/widget/fav_item.dart'; import 'package:PiliPlus/pages/member/controller.dart'; -import 'package:PiliPlus/pages/member_coin/index.dart'; -import 'package:PiliPlus/pages/member_like/index.dart'; +import 'package:PiliPlus/pages/member_like/view.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -44,7 +44,7 @@ class _MemberHomeState extends State final isVertical = context.orientation == Orientation.portrait; return switch (loadingState) { Loading() => loadingWidget, - Success() => loadingState.response is Data + Success() => loadingState.response is SpaceData ? CustomScrollView( slivers: [ if (loadingState.response?.archive?.item?.isNotEmpty == @@ -270,7 +270,7 @@ class _MemberHomeState extends State _ctr.tab2!.indexWhere((item) => item.param == param); if (index != -1) { if (['video', 'article', 'audio'].contains(param1)) { - List items = _ctr.tab2! + List items = _ctr.tab2! .firstWhere((item) => item.param == param) .items!; int index1 = diff --git a/lib/pages/member/content/member_home/widget/fav_item.dart b/lib/pages/member_home/widget/fav_item.dart similarity index 100% rename from lib/pages/member/content/member_home/widget/fav_item.dart rename to lib/pages/member_home/widget/fav_item.dart diff --git a/lib/pages/member_like/index.dart b/lib/pages/member_like/index.dart deleted file mode 100644 index e84771e30..000000000 --- a/lib/pages/member_like/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library member_like; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi_ctr.dart b/lib/pages/member_pgc/controller.dart similarity index 73% rename from lib/pages/member/content/member_contribute/content/bangumi/member_bangumi_ctr.dart rename to lib/pages/member_pgc/controller.dart index 2fee50c70..c2937c82f 100644 --- a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi_ctr.dart +++ b/lib/pages/member_pgc/controller.dart @@ -1,15 +1,15 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; +import 'package:PiliPlus/models/space/data.dart'; import 'package:PiliPlus/models/space_archive/data.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' - show ContributeType; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/models/space/data.dart' as space; -class MemberBangumiCtr extends CommonListController { +class MemberBangumiCtr + extends CommonListController { MemberBangumiCtr({ required this.mid, required this.heroTag, @@ -24,7 +24,7 @@ class MemberBangumiCtr extends CommonListController { void onInit() { super.onInit(); dynamic response = (_ctr.loadingState.value as Success).response; - if (response is space.Data) { + if (response is SpaceData) { currentPage = 2; dynamic res = response.season; loadingState.value = LoadingState.success(res.item); @@ -36,7 +36,7 @@ class MemberBangumiCtr extends CommonListController { } @override - List? getDataList(Data response) { + List? getDataList(SpaceArchiveData response) { return response.item; } @@ -48,7 +48,8 @@ class MemberBangumiCtr extends CommonListController { } @override - Future> customGetData() => MemberHttp.spaceArchive( + Future> customGetData() => + MemberHttp.spaceArchive( type: ContributeType.bangumi, mid: mid, pn: currentPage, diff --git a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart b/lib/pages/member_pgc/view.dart similarity index 95% rename from lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart rename to lib/pages/member_pgc/view.dart index 7af05b322..f2672a74b 100644 --- a/lib/pages/member/content/member_contribute/content/bangumi/member_bangumi.dart +++ b/lib/pages/member_pgc/view.dart @@ -4,7 +4,7 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_member_home.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/bangumi/member_bangumi_ctr.dart'; +import 'package:PiliPlus/pages/member_pgc/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -42,7 +42,7 @@ class _MemberBangumiState extends State return Obx(() => _buildBody(_controller.loadingState.value)); } - _buildBody(LoadingState?> loadingState) { + _buildBody(LoadingState?> loadingState) { return switch (loadingState) { Loading() => loadingWidget, Success() => loadingState.response?.isNotEmpty == true diff --git a/lib/pages/member/widget/edit_profile_page.dart b/lib/pages/member_profile/view.dart similarity index 99% rename from lib/pages/member/widget/edit_profile_page.dart rename to lib/pages/member_profile/view.dart index 6303c9051..7b5915bc8 100644 --- a/lib/pages/member/widget/edit_profile_page.dart +++ b/lib/pages/member_profile/view.dart @@ -1,7 +1,7 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/loading_widget.dart'; import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/index.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; diff --git a/lib/pages/member/content/member_contribute/content/season_series/controller.dart b/lib/pages/member_season_series/controller.dart similarity index 100% rename from lib/pages/member/content/member_contribute/content/season_series/controller.dart rename to lib/pages/member_season_series/controller.dart diff --git a/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart b/lib/pages/member_season_series/view.dart similarity index 90% rename from lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart rename to lib/pages/member_season_series/view.dart index 4b7664c0b..2e185271b 100644 --- a/lib/pages/member/content/member_contribute/content/season_series/season_series_page.dart +++ b/lib/pages/member_season_series/view.dart @@ -1,10 +1,10 @@ import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/loading_widget.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/season_series/controller.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/season_series/widget/season_series_card.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/video/member_video.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart'; +import 'package:PiliPlus/pages/member_season_series/controller.dart'; +import 'package:PiliPlus/pages/member_season_series/widget/season_series_card.dart'; +import 'package:PiliPlus/pages/member_video/view.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/member/content/member_contribute/content/season_series/widget/season_series_card.dart b/lib/pages/member_season_series/widget/season_series_card.dart similarity index 100% rename from lib/pages/member/content/member_contribute/content/season_series/widget/season_series_card.dart rename to lib/pages/member_season_series/widget/season_series_card.dart diff --git a/lib/pages/member/content/member_contribute/content/video/member_video_ctr.dart b/lib/pages/member_video/controller.dart similarity index 92% rename from lib/pages/member/content/member_contribute/content/video/member_video_ctr.dart rename to lib/pages/member_video/controller.dart index f688e08ea..06ad596f8 100644 --- a/lib/pages/member/content/member_contribute/content/video/member_video_ctr.dart +++ b/lib/pages/member_video/controller.dart @@ -5,8 +5,7 @@ import 'package:PiliPlus/models/space_archive/data.dart'; import 'package:PiliPlus/models/space_archive/episodic_button.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' - show ContributeType; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -14,7 +13,8 @@ import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -class MemberVideoCtr extends CommonListController { +class MemberVideoCtr + extends CommonListController { MemberVideoCtr({ required this.type, required this.mid, @@ -71,8 +71,9 @@ class MemberVideoCtr extends CommonListController { } @override - bool customHandleResponse(bool isRefresh, Success response) { - Data data = response.response; + bool customHandleResponse( + bool isRefresh, Success response) { + SpaceArchiveData data = response.response; episodicButton.value = data.episodicButton ?? EpisodicButton(); episodicButton.refresh(); next = data.next; @@ -91,7 +92,7 @@ class MemberVideoCtr extends CommonListController { ? (data.item?.length ?? -1) : (data.count ?? -1); if (currentPage != 0 && loadingState.value is Success) { - data.item ??= []; + data.item ??= []; if (isLoadPrevious == true) { data.item!.addAll((loadingState.value as Success).response); } else { @@ -106,7 +107,8 @@ class MemberVideoCtr extends CommonListController { } @override - Future> customGetData() => MemberHttp.spaceArchive( + Future> customGetData() => + MemberHttp.spaceArchive( type: type, mid: mid, aid: type == ContributeType.video @@ -139,7 +141,7 @@ class MemberVideoCtr extends CommonListController { void toViewPlayAll() async { if (loadingState.value is Success) { - List? list = (loadingState.value as Success).response; + List? list = (loadingState.value as Success).response; if (list.isNullOrEmpty) return; @@ -176,7 +178,7 @@ class MemberVideoCtr extends CommonListController { return; } - for (Item element in list!) { + for (SpaceArchiveItem element in list!) { if (element.cid == null) { continue; } else { diff --git a/lib/pages/member/content/member_contribute/content/video/member_video.dart b/lib/pages/member_video/view.dart similarity index 96% rename from lib/pages/member/content/member_contribute/content/video/member_video.dart rename to lib/pages/member_video/view.dart index 1b3e92abc..6b483bf21 100644 --- a/lib/pages/member/content/member_contribute/content/video/member_video.dart +++ b/lib/pages/member_video/view.dart @@ -6,9 +6,8 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/video_card_h_member_video.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/content/video/member_video_ctr.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' - show ContributeType; +import 'package:PiliPlus/pages/member_video/controller.dart'; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:PiliPlus/pages/member/controller.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; @@ -60,7 +59,7 @@ class _MemberVideoState extends State return Obx(() => _buildBody(_controller.loadingState.value)); } - _buildBody(LoadingState?> loadingState) { + _buildBody(LoadingState?> loadingState) { final theme = Theme.of(context); return switch (loadingState) { Loading() => loadingWidget, @@ -180,7 +179,8 @@ class _MemberVideoState extends State index == loadingState.response!.length - 1) { _controller.onLoadMore(); } - final Item item = loadingState.response![index]; + final SpaceArchiveItem item = + loadingState.response![index]; return VideoCardHMemberVideo( key: ValueKey('${item.param}'), videoItem: item, diff --git a/lib/pages/mine/index.dart b/lib/pages/mine/index.dart deleted file mode 100644 index 0a297f6c2..000000000 --- a/lib/pages/mine/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library mine; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/msg_feed_top/at_me/index.dart b/lib/pages/msg_feed_top/at_me/index.dart deleted file mode 100644 index 6d2ce5339..000000000 --- a/lib/pages/msg_feed_top/at_me/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/msg_feed_top/like_me/index.dart b/lib/pages/msg_feed_top/like_me/index.dart deleted file mode 100644 index 6d2ce5339..000000000 --- a/lib/pages/msg_feed_top/like_me/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart index 0e3ddc5c1..ff0b83b32 100644 --- a/lib/pages/msg_feed_top/like_me/view.dart +++ b/lib/pages/msg_feed_top/like_me/view.dart @@ -5,14 +5,13 @@ import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/msgfeed_like_me.dart'; +import 'package:PiliPlus/pages/msg_feed_top/like_me/controller.dart'; +import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import '../../../utils/app_scheme.dart'; -import 'controller.dart'; - class LikeMePage extends StatefulWidget { const LikeMePage({super.key}); diff --git a/lib/pages/msg_feed_top/reply_me/index.dart b/lib/pages/msg_feed_top/reply_me/index.dart deleted file mode 100644 index 6d2ce5339..000000000 --- a/lib/pages/msg_feed_top/reply_me/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart index d8ed53dc7..79c1481b7 100644 --- a/lib/pages/msg_feed_top/reply_me/view.dart +++ b/lib/pages/msg_feed_top/reply_me/view.dart @@ -4,14 +4,13 @@ import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/msgfeed_reply_me.dart'; +import 'package:PiliPlus/pages/msg_feed_top/reply_me/controller.dart'; +import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import '../../../utils/app_scheme.dart'; -import 'controller.dart'; - class ReplyMePage extends StatefulWidget { const ReplyMePage({super.key}); diff --git a/lib/pages/msg_feed_top/sys_msg/index.dart b/lib/pages/msg_feed_top/sys_msg/index.dart deleted file mode 100644 index 6d2ce5339..000000000 --- a/lib/pages/msg_feed_top/sys_msg/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/bangumi/pgc_index/pgc_index_controller.dart b/lib/pages/pgc_index/controller.dart similarity index 95% rename from lib/pages/bangumi/pgc_index/pgc_index_controller.dart rename to lib/pages/pgc_index/controller.dart index b727c855e..597f3454f 100644 --- a/lib/pages/bangumi/pgc_index/pgc_index_controller.dart +++ b/lib/pages/pgc_index/controller.dart @@ -2,7 +2,7 @@ import 'package:PiliPlus/http/bangumi.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/bangumi/pgc_index/condition.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; -import 'package:get/get.dart' hide Condition; +import 'package:get/get.dart'; class PgcIndexController extends CommonListController { PgcIndexController(this.indexType); @@ -26,7 +26,7 @@ class PgcIndexController extends CommonListController { indexType: indexType, ); if (res is Success) { - Condition data = res.response; + PgcIndexCondition data = res.response; if (data.order?.isNotEmpty == true) { indexParams['order'] = data.order!.first.field; } diff --git a/lib/pages/bangumi/pgc_index/pgc_index_page.dart b/lib/pages/pgc_index/view.dart similarity index 97% rename from lib/pages/bangumi/pgc_index/pgc_index_page.dart rename to lib/pages/pgc_index/view.dart index 3faf1b7ac..f4032acd2 100644 --- a/lib/pages/bangumi/pgc_index/pgc_index_page.dart +++ b/lib/pages/pgc_index/view.dart @@ -3,15 +3,14 @@ import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/loading_widget.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/http/loading_state.dart'; -import 'package:PiliPlus/pages/bangumi/pgc_index/pgc_index_controller.dart'; +import 'package:PiliPlus/models/bangumi/pgc_index/condition.dart'; +import 'package:PiliPlus/pages/pgc_index/controller.dart'; import 'package:PiliPlus/pages/bangumi/widgets/bangumi_card_v_pgc_index.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart' hide Condition; - -import '../../../models/bangumi/pgc_index/condition.dart'; +import 'package:get/get.dart'; class PgcIndexPage extends StatefulWidget { const PgcIndexPage({super.key, this.indexType}); @@ -48,7 +47,7 @@ class _PgcIndexPageState extends State return switch (loadingState) { Loading() => loadingWidget, Success() => Builder(builder: (context) { - Condition data = loadingState.response; + PgcIndexCondition data = loadingState.response; int count = (data.order?.isNotEmpty == true ? 1 : 0) + (data.filter?.length ?? 0); if (count == 0) return const SizedBox.shrink(); diff --git a/lib/pages/rank/controller.dart b/lib/pages/rank/controller.dart index 0ee8c77cc..f84675202 100644 --- a/lib/pages/rank/controller.dart +++ b/lib/pages/rank/controller.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:PiliPlus/pages/common/common_controller.dart'; -import 'package:PiliPlus/pages/rank/zone/index.dart'; +import 'package:PiliPlus/pages/rank/zone/controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/common/rank_type.dart'; diff --git a/lib/pages/rank/index.dart b/lib/pages/rank/index.dart deleted file mode 100644 index eaac0a341..000000000 --- a/lib/pages/rank/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library rank; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/rank/zone/index.dart b/lib/pages/rank/zone/index.dart deleted file mode 100644 index 8f5357361..000000000 --- a/lib/pages/rank/zone/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library rank.zone; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 08b48624e..02acbd1cc 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -2,16 +2,15 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; +import 'package:PiliPlus/pages/rank/zone/controller.dart'; import 'package:PiliPlus/pages/rank/zone/widget/pgc_rank_item.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/video_card_h.dart'; -import 'package:PiliPlus/pages/rank/zone/index.dart'; - -import '../../../utils/grid.dart'; class ZonePage extends CommonPage { const ZonePage({super.key, this.rid, this.seasonType}); diff --git a/lib/pages/rcmd/index.dart b/lib/pages/rcmd/index.dart deleted file mode 100644 index e59cbe6e6..000000000 --- a/lib/pages/rcmd/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library recm_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index ea9e6f287..6a55ed552 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -1,6 +1,8 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_page.dart'; +import 'package:PiliPlus/pages/rcmd/controller.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; @@ -8,9 +10,6 @@ import 'package:PiliPlus/common/skeleton/video_card_v.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/video_card_v.dart'; -import '../../utils/grid.dart'; -import 'controller.dart'; - class RcmdPage extends CommonPage { const RcmdPage({super.key}); diff --git a/lib/common/widgets/save_panel.dart b/lib/pages/save_panel/view.dart similarity index 99% rename from lib/common/widgets/save_panel.dart rename to lib/pages/save_panel/view.dart index c64c83ace..791b9b3af 100644 --- a/lib/common/widgets/save_panel.dart +++ b/lib/pages/save_panel/view.dart @@ -5,10 +5,10 @@ import 'package:PiliPlus/common/widgets/icon_button.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/pages/bangumi/introduction/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/search/index.dart b/lib/pages/search/index.dart deleted file mode 100644 index b6847050b..000000000 --- a/lib/pages/search/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library search; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/search_result/index.dart b/lib/pages/search_result/index.dart deleted file mode 100644 index c37447d35..000000000 --- a/lib/pages/search_result/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library searchresult; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/setting/navigation_bar_set.dart b/lib/pages/setting/navigation_bar_set.dart index 7824a54f7..dba460b1a 100644 --- a/lib/pages/setting/navigation_bar_set.dart +++ b/lib/pages/setting/navigation_bar_set.dart @@ -1,9 +1,8 @@ +import 'package:PiliPlus/models/common/nav_bar_config.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../../../models/common/nav_bar_config.dart'; - class NavigationBarSetPage extends StatefulWidget { const NavigationBarSetPage({super.key}); diff --git a/lib/pages/setting/pages/color_select.dart b/lib/pages/setting/pages/color_select.dart index d99ef6349..7ff1a279e 100644 --- a/lib/pages/setting/pages/color_select.dart +++ b/lib/pages/setting/pages/color_select.dart @@ -1,6 +1,6 @@ import 'package:PiliPlus/models/common/nav_bar_config.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; -import 'package:PiliPlus/pages/home/index.dart'; +import 'package:PiliPlus/pages/home/view.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart'; diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart index 0f4142bb0..1d6b315b3 100644 --- a/lib/pages/setting/pages/logs.dart +++ b/lib/pages/setting/pages/logs.dart @@ -1,9 +1,9 @@ import 'dart:io'; import 'package:PiliPlus/common/widgets/loading_widget.dart'; +import 'package:PiliPlus/services/loggeer.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; -import '../../../services/loggeer.dart'; class LogsPage extends StatefulWidget { const LogsPage({super.key}); diff --git a/lib/pages/setting/search_page.dart b/lib/pages/settings_search/view.dart similarity index 100% rename from lib/pages/setting/search_page.dart rename to lib/pages/settings_search/view.dart diff --git a/lib/pages/setting/sponsor_block_page.dart b/lib/pages/sponsor_block/view.dart similarity index 99% rename from lib/pages/setting/sponsor_block_page.dart rename to lib/pages/sponsor_block/view.dart index 758389ace..e11ec1229 100644 --- a/lib/pages/setting/sponsor_block_page.dart +++ b/lib/pages/sponsor_block/view.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:PiliPlus/common/widgets/pair.dart'; import 'package:PiliPlus/http/constants.dart'; -import 'package:PiliPlus/http/index.dart'; +import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/skip_type.dart'; import 'package:PiliPlus/pages/setting/slide_color_picker.dart'; diff --git a/lib/pages/subscription/controller.dart b/lib/pages/subscription/controller.dart index 9bf5e8619..a40c4195e 100644 --- a/lib/pages/subscription/controller.dart +++ b/lib/pages/subscription/controller.dart @@ -1,4 +1,5 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -6,8 +7,6 @@ import 'package:get/get.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../../models/user/sub_folder.dart'; - class SubController extends CommonListController?, SubFolderItemData> { dynamic mid; diff --git a/lib/pages/subscription/index.dart b/lib/pages/subscription/index.dart deleted file mode 100644 index 4d0343967..000000000 --- a/lib/pages/subscription/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library sub; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart index f34cee294..7edb7ce44 100644 --- a/lib/pages/subscription/widgets/item.dart +++ b/lib/pages/subscription/widgets/item.dart @@ -1,12 +1,11 @@ import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/utils/utils.dart'; -import '../../../models/user/sub_folder.dart'; - class SubItem extends StatelessWidget { final SubFolderItemData subFolderItem; final Function(SubFolderItemData) cancelSub; diff --git a/lib/pages/subscription_detail/controller.dart b/lib/pages/subscription_detail/controller.dart index 71566509c..0ac33e26f 100644 --- a/lib/pages/subscription_detail/controller.dart +++ b/lib/pages/subscription_detail/controller.dart @@ -1,11 +1,10 @@ import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/models/user/sub_detail.dart'; +import 'package:PiliPlus/models/user/sub_folder.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/http/user.dart'; -import '../../models/user/sub_detail.dart'; -import '../../models/user/sub_folder.dart'; - class SubDetailController extends CommonListController { late SubFolderItemData item; diff --git a/lib/pages/subscription_detail/index.dart b/lib/pages/subscription_detail/index.dart deleted file mode 100644 index 71df4b24d..000000000 --- a/lib/pages/subscription_detail/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library sub_detail; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/subscription_detail/view.dart b/lib/pages/subscription_detail/view.dart index f35c4dfb9..560c968f4 100644 --- a/lib/pages/subscription_detail/view.dart +++ b/lib/pages/subscription_detail/view.dart @@ -1,17 +1,16 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/user/sub_detail.dart'; +import 'package:PiliPlus/models/user/sub_folder.dart'; +import 'package:PiliPlus/pages/subscription_detail/controller.dart'; +import 'package:PiliPlus/pages/subscription_detail/widget/sub_video_card.dart'; import 'package:PiliPlus/utils/grid.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import '../../models/user/sub_folder.dart'; -import '../../utils/utils.dart'; -import 'controller.dart'; -import 'widget/sub_video_card.dart'; - class SubDetailPage extends StatefulWidget { const SubDetailPage({super.key}); diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart index 51cb5e4d7..a466ffce1 100644 --- a/lib/pages/subscription_detail/widget/sub_video_card.dart +++ b/lib/pages/subscription_detail/widget/sub_video_card.dart @@ -1,4 +1,6 @@ +import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/image_save.dart'; +import 'package:PiliPlus/models/user/sub_detail.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:flutter/material.dart'; import 'package:PiliPlus/common/constants.dart'; @@ -7,8 +9,6 @@ import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import '../../../common/widgets/badge.dart'; -import '../../../models/user/sub_detail.dart'; // 收藏视频卡片 - 水平布局 class SubVideoCardH extends StatelessWidget { diff --git a/lib/pages/video/README.md b/lib/pages/video/README.md deleted file mode 100644 index 2da26fa74..000000000 --- a/lib/pages/video/README.md +++ /dev/null @@ -1,10 +0,0 @@ -视频详情页预渲染 -+ videoItem - + title - + stat - + view - + danmaku - + pubdate - + owner - + face - + name \ No newline at end of file diff --git a/lib/pages/video/detail/widgets/ai_detail.dart b/lib/pages/video/ai/view.dart similarity index 98% rename from lib/pages/video/detail/widgets/ai_detail.dart rename to lib/pages/video/ai/view.dart index 8897c3d25..64a1fcf91 100644 --- a/lib/pages/video/detail/widgets/ai_detail.dart +++ b/lib/pages/video/ai/view.dart @@ -1,5 +1,5 @@ import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/controller.dart similarity index 98% rename from lib/pages/video/detail/controller.dart rename to lib/pages/video/controller.dart index 5d39571d2..f6bc4c2bf 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/controller.dart @@ -16,12 +16,17 @@ import 'package:PiliPlus/models/common/sponsor_block/skip_type.dart'; import 'package:PiliPlus/models/video/later.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; -import 'package:PiliPlus/pages/video/detail/note/note_list_page.dart'; -import 'package:PiliPlus/pages/video/detail/post_panel/post_panel.dart'; -import 'package:PiliPlus/pages/video/detail/widgets/send_danmaku_panel.dart'; -import 'package:PiliPlus/pages/video/detail/widgets/media_list_panel.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/note/view.dart'; +import 'package:PiliPlus/pages/video/post_panel/view.dart'; +import 'package:PiliPlus/pages/video/send_danmaku/view.dart'; +import 'package:PiliPlus/pages/video/medialist/view.dart'; +import 'package:PiliPlus/pages/video/widgets/header_control.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/data_source.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:easy_debounce/easy_throttle.dart'; @@ -36,7 +41,6 @@ import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; import 'package:PiliPlus/models/video/play/url.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/utils/video_utils.dart'; @@ -45,9 +49,6 @@ import 'package:hive/hive.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:media_kit/media_kit.dart'; -import '../../../utils/id_utils.dart'; -import 'widgets/header_control.dart'; - class VideoDetailController extends GetxController with GetTickerProviderStateMixin { /// 路由传参 diff --git a/lib/pages/video/detail/index.dart b/lib/pages/video/detail/index.dart deleted file mode 100644 index c22ccf691..000000000 --- a/lib/pages/video/detail/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library video_detail; - -export './controller.dart'; -export './view_v.dart'; diff --git a/lib/pages/video/detail/introduction/index.dart b/lib/pages/video/detail/introduction/index.dart deleted file mode 100644 index 5eaae5728..000000000 --- a/lib/pages/video/detail/introduction/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library video_intro_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/video/detail/related/index.dart b/lib/pages/video/detail/related/index.dart deleted file mode 100644 index ce29b10a7..000000000 --- a/lib/pages/video/detail/related/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library releated_video_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/video/detail/reply/index.dart b/lib/pages/video/detail/reply/index.dart deleted file mode 100644 index f3d25ba42..000000000 --- a/lib/pages/video/detail/reply/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library video_reply_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/video/detail/reply_reply/index.dart b/lib/pages/video/detail/reply_reply/index.dart deleted file mode 100644 index 1040b9ee4..000000000 --- a/lib/pages/video/detail/reply_reply/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library video_reply_reply_panel; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/bangumi/introduction/controller.dart b/lib/pages/video/introduction/pgc/controller.dart similarity index 98% rename from lib/pages/bangumi/introduction/controller.dart rename to lib/pages/video/introduction/pgc/controller.dart index fae1ede8e..e24de95ab 100644 --- a/lib/pages/bangumi/introduction/controller.dart +++ b/lib/pages/video/introduction/pgc/controller.dart @@ -4,9 +4,11 @@ import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; -import 'package:PiliPlus/pages/dynamics/repost_dyn_panel.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/pay_coins_page.dart'; +import 'package:PiliPlus/pages/dynamics_repost/view.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/pay_coins/view.dart'; +import 'package:PiliPlus/pages/video/reply/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -19,8 +21,6 @@ import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; -import 'package:PiliPlus/pages/video/detail/reply/index.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/video/introduction/pgc/view.dart similarity index 98% rename from lib/pages/bangumi/introduction/view.dart rename to lib/pages/video/introduction/pgc/view.dart index c0a608d73..e7a43b57f 100644 --- a/lib/pages/bangumi/introduction/view.dart +++ b/lib/pages/video/introduction/pgc/view.dart @@ -5,7 +5,10 @@ import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart' show SourceModel; import 'package:PiliPlus/http/loading_state.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; @@ -15,15 +18,11 @@ import 'package:PiliPlus/common/widgets/badge.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/pages/bangumi/widgets/bangumi_panel.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/action_item.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/action_row_item.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/widgets/bangumi_panel.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_row_item.dart'; import 'package:PiliPlus/utils/feed_back.dart'; -import '../../../utils/utils.dart'; -import 'controller.dart'; - class BangumiIntroPanel extends StatefulWidget { final int? cid; final String heroTag; diff --git a/lib/pages/bangumi/widgets/bangumi_panel.dart b/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart similarity index 99% rename from lib/pages/bangumi/widgets/bangumi_panel.dart rename to lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart index 5c333c0a5..cbea98131 100644 --- a/lib/pages/bangumi/widgets/bangumi_panel.dart +++ b/lib/pages/video/introduction/pgc/widgets/bangumi_panel.dart @@ -1,11 +1,11 @@ import 'dart:async'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; import 'package:PiliPlus/utils/storage.dart'; class BangumiPanel extends StatefulWidget { diff --git a/lib/pages/bangumi/introduction/widgets/intro_detail.dart b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart similarity index 99% rename from lib/pages/bangumi/introduction/widgets/intro_detail.dart rename to lib/pages/video/introduction/pgc/widgets/intro_detail.dart index 0c8260061..81e077b61 100644 --- a/lib/pages/bangumi/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/introduction/pgc/widgets/intro_detail.dart @@ -2,11 +2,10 @@ import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import '../../../../utils/utils.dart'; - class IntroDetail extends CommonCollapseSlidePage { final BangumiInfoModel bangumiDetail; final dynamic videoTags; diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/introduction/ugc/controller.dart similarity index 98% rename from lib/pages/video/detail/introduction/controller.dart rename to lib/pages/video/introduction/ugc/controller.dart index fa9041b7a..f285cc249 100644 --- a/lib/pages/video/detail/introduction/controller.dart +++ b/lib/pages/video/introduction/ugc/controller.dart @@ -4,8 +4,12 @@ import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/member.dart'; -import 'package:PiliPlus/pages/dynamics/repost_dyn_panel.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/pay_coins_page.dart'; +import 'package:PiliPlus/http/search.dart'; +import 'package:PiliPlus/models/model_hot_video_item.dart'; +import 'package:PiliPlus/pages/dynamics_repost/view.dart'; +import 'package:PiliPlus/pages/video/pay_coins/view.dart'; +import 'package:PiliPlus/pages/video/related/controller.dart'; +import 'package:PiliPlus/pages/video/reply/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -21,17 +25,12 @@ import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/models/video/ai.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; -import 'package:PiliPlus/pages/video/detail/reply/index.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; -import '../../../../http/search.dart'; -import '../../../../models/model_hot_video_item.dart'; -import '../related/index.dart'; - class VideoIntroController extends GetxController { // 视频bvid late String bvid; diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/introduction/ugc/view.dart similarity index 99% rename from lib/pages/video/detail/introduction/view.dart rename to lib/pages/video/introduction/ugc/view.dart index 1ce83b013..5647a31e3 100644 --- a/lib/pages/video/detail/introduction/view.dart +++ b/lib/pages/video/introduction/ugc/view.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/pages/search/widgets/search_text.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; @@ -18,11 +19,10 @@ import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/stat/stat.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/pages/video/detail/introduction/widgets/action_item.dart b/lib/pages/video/introduction/ugc/widgets/action_item.dart similarity index 100% rename from lib/pages/video/detail/introduction/widgets/action_item.dart rename to lib/pages/video/introduction/ugc/widgets/action_item.dart diff --git a/lib/pages/video/detail/introduction/widgets/action_row_item.dart b/lib/pages/video/introduction/ugc/widgets/action_row_item.dart similarity index 100% rename from lib/pages/video/detail/introduction/widgets/action_row_item.dart rename to lib/pages/video/introduction/ugc/widgets/action_row_item.dart diff --git a/lib/pages/video/detail/introduction/widgets/menu_row.dart b/lib/pages/video/introduction/ugc/widgets/menu_row.dart similarity index 100% rename from lib/pages/video/detail/introduction/widgets/menu_row.dart rename to lib/pages/video/introduction/ugc/widgets/menu_row.dart diff --git a/lib/pages/video/detail/introduction/widgets/page.dart b/lib/pages/video/introduction/ugc/widgets/page.dart similarity index 97% rename from lib/pages/video/detail/introduction/widgets/page.dart rename to lib/pages/video/introduction/ugc/widgets/page.dart index 397555e75..de396fb0e 100644 --- a/lib/pages/video/detail/introduction/widgets/page.dart +++ b/lib/pages/video/introduction/ugc/widgets/page.dart @@ -1,13 +1,12 @@ import 'dart:async'; import 'dart:math'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; - -import '../../../../../utils/id_utils.dart'; class PagesPanel extends StatefulWidget { const PagesPanel({ diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/introduction/ugc/widgets/season.dart similarity index 97% rename from lib/pages/video/detail/introduction/widgets/season.dart rename to lib/pages/video/introduction/ugc/widgets/season.dart index d18647b6f..165ddd7b4 100644 --- a/lib/pages/video/detail/introduction/widgets/season.dart +++ b/lib/pages/video/introduction/ugc/widgets/season.dart @@ -1,11 +1,11 @@ import 'dart:async'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; class SeasonPanel extends StatefulWidget { const SeasonPanel({ diff --git a/lib/pages/video/detail/widgets/media_list_panel.dart b/lib/pages/video/medialist/view.dart similarity index 100% rename from lib/pages/video/detail/widgets/media_list_panel.dart rename to lib/pages/video/medialist/view.dart diff --git a/lib/pages/video/detail/member/controller.dart b/lib/pages/video/member/controller.dart similarity index 94% rename from lib/pages/video/detail/member/controller.dart rename to lib/pages/video/member/controller.dart index 590b605c0..47abbc830 100644 --- a/lib/pages/video/detail/member/controller.dart +++ b/lib/pages/video/member/controller.dart @@ -4,8 +4,7 @@ import 'package:PiliPlus/models/member/info.dart'; import 'package:PiliPlus/models/space_archive/data.dart'; import 'package:PiliPlus/models/space_archive/item.dart'; import 'package:PiliPlus/pages/common/common_data_controller.dart'; -import 'package:PiliPlus/pages/member/content/member_contribute/member_contribute.dart' - show ContributeType; +import 'package:PiliPlus/pages/member_contribute/view.dart' show ContributeType; import 'package:get/get.dart'; class HorizontalMemberPageController extends CommonDataController { @@ -52,7 +51,7 @@ class HorizontalMemberPageController extends CommonDataController { @override bool customHandleResponse(bool isRefresh, Success response) { - Data data = response.response; + SpaceArchiveData data = response.response; count.value = data.count ?? -1; if (currentPage == 0 || isLoadPrevious) { hasPrev = data.hasPrev ?? false; @@ -61,7 +60,7 @@ class HorizontalMemberPageController extends CommonDataController { hasNext = data.hasNext ?? false; } if (currentPage != 0 && loadingState.value is Success) { - data.item ??= []; + data.item ??= []; if (isLoadPrevious) { data.item!.addAll((loadingState.value as Success).response); } else { diff --git a/lib/pages/video/detail/member/horizontal_member_page.dart b/lib/pages/video/member/view.dart similarity index 97% rename from lib/pages/video/detail/member/horizontal_member_page.dart rename to lib/pages/video/member/view.dart index ffba12e72..4b6713731 100644 --- a/lib/pages/video/detail/member/horizontal_member_page.dart +++ b/lib/pages/video/member/view.dart @@ -8,9 +8,10 @@ import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/common/widgets/video_card_h_member_video.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/member/info.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; -import 'package:PiliPlus/pages/video/detail/member/controller.dart'; +import 'package:PiliPlus/models/space_archive/item.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/member/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/id_utils.dart'; @@ -21,8 +22,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import '../../../../models/space_archive/item.dart'; - class HorizontalMemberPage extends StatefulWidget { const HorizontalMemberPage({ super.key, @@ -200,7 +199,8 @@ class _HorizontalMemberPageState extends State { _controller.hasNext) { _controller.onLoadMore(); } - final Item videoItem = loadingState.response[index]; + final SpaceArchiveItem videoItem = + loadingState.response[index]; return VideoCardHMemberVideo( key: ValueKey('${videoItem.param}'), videoItem: videoItem, diff --git a/lib/pages/video/detail/note/note_list_page_ctr.dart b/lib/pages/video/note/controller.dart similarity index 100% rename from lib/pages/video/detail/note/note_list_page_ctr.dart rename to lib/pages/video/note/controller.dart diff --git a/lib/pages/video/detail/note/note_list_page.dart b/lib/pages/video/note/view.dart similarity index 98% rename from lib/pages/video/detail/note/note_list_page.dart rename to lib/pages/video/note/view.dart index 23352b7bb..9b147d410 100644 --- a/lib/pages/video/detail/note/note_list_page.dart +++ b/lib/pages/video/note/view.dart @@ -5,8 +5,8 @@ import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/note/note_list_page_ctr.dart'; -import 'package:PiliPlus/pages/webview/webview_page.dart'; +import 'package:PiliPlus/pages/video/note/controller.dart'; +import 'package:PiliPlus/pages/webview/view.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/pages/video/detail/introduction/pay_coins_page.dart b/lib/pages/video/pay_coins/view.dart similarity index 100% rename from lib/pages/video/detail/introduction/pay_coins_page.dart rename to lib/pages/video/pay_coins/view.dart diff --git a/lib/pages/video/detail/post_panel/post_panel.dart b/lib/pages/video/post_panel/view.dart similarity index 99% rename from lib/pages/video/detail/post_panel/post_panel.dart rename to lib/pages/video/post_panel/view.dart index 433e9b7de..82bd7537d 100644 --- a/lib/pages/video/detail/post_panel/post_panel.dart +++ b/lib/pages/video/post_panel/view.dart @@ -10,8 +10,8 @@ import 'package:PiliPlus/models/common/sponsor_block/action_type.dart'; import 'package:PiliPlus/models/common/sponsor_block/post_segment_model.dart'; import 'package:PiliPlus/models/common/sponsor_block/segment_type.dart'; import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; diff --git a/lib/pages/video/detail/related/controller.dart b/lib/pages/video/related/controller.dart similarity index 100% rename from lib/pages/video/detail/related/controller.dart rename to lib/pages/video/related/controller.dart diff --git a/lib/pages/video/detail/related/view.dart b/lib/pages/video/related/view.dart similarity index 93% rename from lib/pages/video/detail/related/view.dart rename to lib/pages/video/related/view.dart index d87f25162..a807f241f 100644 --- a/lib/pages/video/detail/related/view.dart +++ b/lib/pages/video/related/view.dart @@ -1,13 +1,13 @@ +import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/model_hot_video_item.dart'; +import 'package:PiliPlus/pages/video/related/controller.dart'; +import 'package:PiliPlus/utils/grid.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/skeleton/video_card_h.dart'; import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/common/widgets/video_card_h.dart'; -import '../../../../common/constants.dart'; -import '../../../../utils/grid.dart'; -import './controller.dart'; class RelatedVideoPanel extends StatefulWidget { const RelatedVideoPanel({super.key, required this.heroTag}); diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/reply/controller.dart similarity index 100% rename from lib/pages/video/detail/reply/controller.dart rename to lib/pages/video/reply/controller.dart diff --git a/lib/pages/video/detail/reply/view.dart b/lib/pages/video/reply/view.dart similarity index 99% rename from lib/pages/video/detail/reply/view.dart rename to lib/pages/video/reply/view.dart index 8aca667dc..a596fd3fb 100644 --- a/lib/pages/video/detail/reply/view.dart +++ b/lib/pages/video/reply/view.dart @@ -4,7 +4,7 @@ import 'package:PiliPlus/common/widgets/http_error.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/reply_sort_type.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart b/lib/pages/video/reply/widgets/reply_item_grpc.dart similarity index 99% rename from lib/pages/video/detail/reply/widgets/reply_item_grpc.dart rename to lib/pages/video/reply/widgets/reply_item_grpc.dart index 9291bbd64..20ee54b10 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart +++ b/lib/pages/video/reply/widgets/reply_item_grpc.dart @@ -8,8 +8,9 @@ import 'package:PiliPlus/common/widgets/report.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/common/widgets/save_panel.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/zan_grpc.dart'; +import 'package:PiliPlus/pages/save_panel/view.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/zan_grpc.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -20,7 +21,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/url_utils.dart'; diff --git a/lib/pages/video/detail/reply/widgets/zan_grpc.dart b/lib/pages/video/reply/widgets/zan_grpc.dart similarity index 100% rename from lib/pages/video/detail/reply/widgets/zan_grpc.dart rename to lib/pages/video/reply/widgets/zan_grpc.dart diff --git a/lib/pages/video/detail/reply_new/reply_page.dart b/lib/pages/video/reply_new/view.dart similarity index 99% rename from lib/pages/video/detail/reply_new/reply_page.dart rename to lib/pages/video/reply_new/view.dart index e667c2a37..8b4021463 100644 --- a/lib/pages/video/detail/reply_new/reply_page.dart +++ b/lib/pages/video/reply_new/view.dart @@ -4,7 +4,7 @@ import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/main.dart'; import 'package:PiliPlus/pages/common/common_publish_page.dart'; import 'package:PiliPlus/pages/emote/view.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/toolbar_icon_button.dart'; +import 'package:PiliPlus/common/widgets/toolbar_icon_button.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/reply_reply/controller.dart similarity index 100% rename from lib/pages/video/detail/reply_reply/controller.dart rename to lib/pages/video/reply_reply/controller.dart diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/reply_reply/view.dart similarity index 99% rename from lib/pages/video/detail/reply_reply/view.dart rename to lib/pages/video/reply_reply/view.dart index be31a6555..1e696278c 100644 --- a/lib/pages/video/detail/reply_reply/view.dart +++ b/lib/pages/video/reply_reply/view.dart @@ -3,8 +3,8 @@ import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart'; -import 'package:PiliPlus/pages/video/detail/reply_new/reply_page.dart'; +import 'package:PiliPlus/pages/video/reply/widgets/reply_item_grpc.dart'; +import 'package:PiliPlus/pages/video/reply_new/view.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/request_utils.dart'; diff --git a/lib/pages/video/detail/widgets/send_danmaku_panel.dart b/lib/pages/video/send_danmaku/view.dart similarity index 100% rename from lib/pages/video/detail/widgets/send_danmaku_panel.dart rename to lib/pages/video/send_danmaku/view.dart diff --git a/lib/pages/video/detail/view_v.dart b/lib/pages/video/view.dart similarity index 98% rename from lib/pages/video/detail/view_v.dart rename to lib/pages/video/view.dart index 564655659..645d41dfd 100644 --- a/lib/pages/video/detail/view_v.dart +++ b/lib/pages/video/view.dart @@ -4,21 +4,35 @@ import 'dart:math'; import 'dart:ui'; import 'package:PiliPlus/common/constants.dart'; -import 'package:PiliPlus/common/widgets/episode_panel.dart'; +import 'package:PiliPlus/pages/episode_panel/view.dart'; +import 'package:PiliPlus/common/widgets/scroll_physics.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/main.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; -import 'package:PiliPlus/pages/bangumi/introduction/widgets/intro_detail.dart' +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/view.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/widgets/intro_detail.dart' as bangumi; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/page.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/season.dart'; -import 'package:PiliPlus/pages/video/detail/member/controller.dart'; -import 'package:PiliPlus/pages/video/detail/member/horizontal_member_page.dart'; -import 'package:PiliPlus/pages/video/detail/reply_reply/view.dart'; -import 'package:PiliPlus/pages/video/detail/view_point/view_points_page.dart'; -import 'package:PiliPlus/pages/video/detail/widgets/ai_detail.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/view.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/page.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/season.dart'; +import 'package:PiliPlus/pages/video/member/controller.dart'; +import 'package:PiliPlus/pages/video/member/view.dart'; +import 'package:PiliPlus/pages/video/related/view.dart'; +import 'package:PiliPlus/pages/video/reply/controller.dart'; +import 'package:PiliPlus/pages/video/reply/view.dart'; +import 'package:PiliPlus/pages/video/reply_reply/view.dart'; +import 'package:PiliPlus/pages/video/view_point/view.dart'; +import 'package:PiliPlus/pages/video/ai/view.dart'; +import 'package:PiliPlus/pages/video/widgets/header_control.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; +import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; +import 'package:PiliPlus/plugin/pl_player/view.dart'; +import 'package:PiliPlus/services/shutdown_timer_service.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; @@ -38,13 +52,8 @@ import 'package:get/get.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:PiliPlus/models/common/search_type.dart'; -import 'package:PiliPlus/pages/bangumi/introduction/index.dart'; import 'package:PiliPlus/pages/danmaku/view.dart'; -import 'package:PiliPlus/pages/video/detail/reply/index.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/index.dart'; -import 'package:PiliPlus/pages/video/detail/related/index.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/utils/storage.dart'; @@ -52,10 +61,6 @@ import 'package:PiliPlus/models/bangumi/info.dart' as bangumi; import 'package:PiliPlus/models/video_detail_res.dart' as video; import 'package:screen_brightness/screen_brightness.dart'; -import '../../../services/shutdown_timer_service.dart'; -import 'widgets/header_control.dart'; -import 'package:PiliPlus/common/widgets/scroll_physics.dart'; - class VideoDetailPageV extends StatefulWidget { const VideoDetailPageV({super.key}); diff --git a/lib/pages/video/detail/view_point/view_points_page.dart b/lib/pages/video/view_point/view.dart similarity index 98% rename from lib/pages/video/detail/view_point/view_points_page.dart rename to lib/pages/video/view_point/view.dart index d1ab88d6d..9a17b93a6 100644 --- a/lib/pages/video/detail/view_point/view_points_page.dart +++ b/lib/pages/video/view_point/view.dart @@ -3,8 +3,8 @@ import 'package:PiliPlus/common/widgets/icon_button.dart'; import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/common/widgets/segment_progress_bar.dart'; import 'package:PiliPlus/pages/common/common_collapse_slide_page.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/video/detail/widgets/app_bar.dart b/lib/pages/video/widgets/app_bar.dart similarity index 96% rename from lib/pages/video/detail/widgets/app_bar.dart rename to lib/pages/video/widgets/app_bar.dart index ca475093d..4060fd93b 100644 --- a/lib/pages/video/detail/widgets/app_bar.dart +++ b/lib/pages/video/widgets/app_bar.dart @@ -1,5 +1,5 @@ +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:flutter/material.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; class ScrollAppBar extends StatelessWidget { final double scrollVal; diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart similarity index 99% rename from lib/pages/video/detail/widgets/header_control.dart rename to lib/pages/video/widgets/header_control.dart index 6b8886df0..239a1ec6a 100644 --- a/lib/pages/video/detail/widgets/header_control.dart +++ b/lib/pages/video/widgets/header_control.dart @@ -6,9 +6,15 @@ import 'package:PiliPlus/common/widgets/icon_button.dart'; import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart'; import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/common/super_resolution_type.dart'; -import 'package:PiliPlus/pages/bangumi/introduction/controller.dart'; +import 'package:PiliPlus/models/video/play/CDN.dart'; +import 'package:PiliPlus/pages/setting/widgets/select_dialog.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; import 'package:PiliPlus/pages/setting/widgets/switch_item.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/action_item.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/action_item.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; import 'package:PiliPlus/utils/download.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -28,15 +34,10 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart import 'package:media_kit/media_kit.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; import 'package:PiliPlus/models/video/play/url.dart'; -import 'package:PiliPlus/pages/video/detail/index.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/menu_row.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:share_plus/share_plus.dart'; -import '../../../../models/video/play/CDN.dart'; -import '../../../setting/widgets/select_dialog.dart'; -import '../introduction/index.dart'; import 'package:marquee/marquee.dart'; class HeaderControl extends StatefulWidget implements PreferredSizeWidget { diff --git a/lib/pages/webview/webview_page.dart b/lib/pages/webview/view.dart similarity index 100% rename from lib/pages/webview/webview_page.dart rename to lib/pages/webview/view.dart diff --git a/lib/pages/whisper/controller.dart b/lib/pages/whisper/controller.dart index f88172b6d..9131e86a8 100644 --- a/lib/pages/whisper/controller.dart +++ b/lib/pages/whisper/controller.dart @@ -1,16 +1,15 @@ import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/msg/account.dart'; +import 'package:PiliPlus/models/msg/msgfeed_unread.dart'; import 'package:PiliPlus/models/msg/session.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/http/msg.dart'; -import '../../models/msg/msgfeed_unread.dart'; -import '../../utils/storage.dart'; - class WhisperController extends CommonListController?, SessionList> { late final List msgFeedTopItems; diff --git a/lib/pages/whisper/index.dart b/lib/pages/whisper/index.dart deleted file mode 100644 index 6d2ce5339..000000000 --- a/lib/pages/whisper/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/whisper_detail/controller.dart b/lib/pages/whisper_detail/controller.dart index c19fadff0..a7ce187b0 100644 --- a/lib/pages/whisper_detail/controller.dart +++ b/lib/pages/whisper_detail/controller.dart @@ -3,13 +3,13 @@ import 'dart:convert'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/msg/session.dart'; -import '../../utils/feed_back.dart'; -import '../../utils/storage.dart'; class WhisperDetailController extends CommonListController { diff --git a/lib/pages/whisper_detail/index.dart b/lib/pages/whisper_detail/index.dart deleted file mode 100644 index 79b4ea19c..000000000 --- a/lib/pages/whisper_detail/index.dart +++ /dev/null @@ -1,4 +0,0 @@ -library whisper_detail; - -export './controller.dart'; -export './view.dart'; diff --git a/lib/pages/whisper_detail/widget/chat_item.dart b/lib/pages/whisper_detail/widget/chat_item.dart index 03944837e..7626c5dfe 100644 --- a/lib/pages/whisper_detail/widget/chat_item.dart +++ b/lib/pages/whisper_detail/widget/chat_item.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/msg/session.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; @@ -11,8 +12,6 @@ import 'package:PiliPlus/common/widgets/network_img_layer.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:get/get.dart'; -import '../../../http/search.dart'; - enum MsgType { invalid(value: 0, label: "空空的~"), text(value: 1, label: "文本消息"), diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index 2caa4dbc5..711d18317 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -7,6 +7,11 @@ import 'package:PiliPlus/common/widgets/segment_progress_bar.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/models/common/audio_normalization.dart'; import 'package:PiliPlus/models/user/danmaku_rule.dart'; +import 'package:PiliPlus/plugin/pl_player/models/data_source.dart'; +import 'package:PiliPlus/plugin/pl_player/models/data_status.dart'; +import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; +import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:canvas_danmaku/canvas_danmaku.dart'; @@ -21,7 +26,6 @@ import 'package:media_kit/media_kit.dart'; import 'package:media_kit_video/media_kit_video.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/pages/mine/controller.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart'; import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/utils/feed_back.dart'; diff --git a/lib/plugin/pl_player/index.dart b/lib/plugin/pl_player/index.dart deleted file mode 100644 index 9d7112648..000000000 --- a/lib/plugin/pl_player/index.dart +++ /dev/null @@ -1,14 +0,0 @@ -library pl_player; - -export './controller.dart'; -export './view.dart'; -export './models/data_source.dart'; -export './models/play_status.dart'; -export './models/data_status.dart'; -export './widgets/common_btn.dart'; -export './models/play_speed.dart'; -export './models/fullscreen_mode.dart'; -export './models/bottom_progress_behavior.dart'; -export './widgets/app_bar_ani.dart'; -export './utils/fullscreen.dart'; -export './utils.dart'; diff --git a/lib/plugin/pl_player/utils/fullscreen.dart b/lib/plugin/pl_player/utils/fullscreen.dart index bf8c16381..25209c91c 100644 --- a/lib/plugin/pl_player/utils/fullscreen.dart +++ b/lib/plugin/pl_player/utils/fullscreen.dart @@ -1,13 +1,12 @@ import 'dart:async'; import 'dart:io'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:auto_orientation/auto_orientation.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import '../../../utils/storage.dart'; - Timer? screenTimer; void stopScreenTimer() { screenTimer?.cancel(); diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index d9d692edb..ac30cde4f 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -2,13 +2,25 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; +import 'package:PiliPlus/common/widgets/audio_video_progress_bar.dart'; import 'package:PiliPlus/common/widgets/segment_progress_bar.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/models/common/super_resolution_type.dart'; -import 'package:PiliPlus/pages/video/detail/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/controller.dart'; +import 'package:PiliPlus/models/video_detail_res.dart'; +import 'package:PiliPlus/pages/video/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/bottom_control_type.dart'; +import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/app_bar_ani.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/backward_seek.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/bottom_control.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/common_btn.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/forward_seek.dart'; +import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/id_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:easy_debounce/easy_throttle.dart'; import 'package:fl_chart/fl_chart.dart'; @@ -28,19 +40,6 @@ import 'package:PiliPlus/utils/storage.dart'; import 'package:saver_gallery/saver_gallery.dart'; import 'package:screen_brightness/screen_brightness.dart'; -import '../../common/widgets/audio_video_progress_bar.dart'; -import '../../models/video_detail_res.dart'; -import '../../pages/bangumi/introduction/controller.dart'; -import '../../utils/utils.dart'; -import 'models/bottom_control_type.dart'; -import 'models/bottom_progress_behavior.dart'; -import 'widgets/app_bar_ani.dart'; -import 'widgets/backward_seek.dart'; -import 'widgets/bottom_control.dart'; -import 'widgets/common_btn.dart'; -import 'widgets/forward_seek.dart'; -import 'widgets/play_pause_btn.dart'; - class PLVideoPlayer extends StatefulWidget { const PLVideoPlayer({ required this.plPlayerController, diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart index df8bf89b3..de2b4b8d6 100644 --- a/lib/plugin/pl_player/widgets/bottom_control.dart +++ b/lib/plugin/pl_player/widgets/bottom_control.dart @@ -1,20 +1,15 @@ import 'dart:async'; +import 'package:PiliPlus/common/widgets/audio_video_progress_bar.dart'; import 'package:PiliPlus/common/widgets/segment_progress_bar.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/feed_back.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:get/get.dart'; import 'package:nil/nil.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart' - show - PlPlayerController, - buildSeekPreviewWidget, - buildDmChart, - buildViewPointWidget; -import 'package:PiliPlus/utils/feed_back.dart'; - -import '../../../common/widgets/audio_video_progress_bar.dart'; class BottomControl extends StatelessWidget implements PreferredSizeWidget { final PlPlayerController controller; diff --git a/lib/plugin/pl_player/widgets/play_pause_btn.dart b/lib/plugin/pl_player/widgets/play_pause_btn.dart index 2e2a8f120..3625bc644 100644 --- a/lib/plugin/pl_player/widgets/play_pause_btn.dart +++ b/lib/plugin/pl_player/widgets/play_pause_btn.dart @@ -1,8 +1,8 @@ import 'dart:async'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; import 'package:flutter/material.dart'; import 'package:media_kit/media_kit.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; class PlayOrPauseButton extends StatefulWidget { final double? iconSize; diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index c014b22e5..bdf7eb0e6 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -1,64 +1,62 @@ import 'package:PiliPlus/pages/about/view.dart'; import 'package:PiliPlus/pages/article/view.dart'; +import 'package:PiliPlus/pages/blacklist/view.dart'; +import 'package:PiliPlus/pages/danmaku_block/view.dart'; +import 'package:PiliPlus/pages/dynamics/view.dart'; +import 'package:PiliPlus/pages/dynamics_detail/view.dart'; +import 'package:PiliPlus/pages/fan/view.dart'; import 'package:PiliPlus/pages/fav/view.dart'; +import 'package:PiliPlus/pages/fav_detail/view.dart'; import 'package:PiliPlus/pages/fav_search/view.dart'; +import 'package:PiliPlus/pages/follow/view.dart'; import 'package:PiliPlus/pages/follow_search/view.dart'; +import 'package:PiliPlus/pages/history/view.dart'; import 'package:PiliPlus/pages/history_search/view.dart'; +import 'package:PiliPlus/pages/home/view.dart'; +import 'package:PiliPlus/pages/hot/view.dart'; +import 'package:PiliPlus/pages/later/view.dart'; import 'package:PiliPlus/pages/later_search/view.dart'; -import 'package:PiliPlus/pages/member/member_page.dart'; -import 'package:PiliPlus/pages/member/widget/edit_profile_page.dart'; +import 'package:PiliPlus/pages/live_room/view.dart'; +import 'package:PiliPlus/pages/login/view.dart'; +import 'package:PiliPlus/pages/media/view.dart'; +import 'package:PiliPlus/pages/member/view.dart'; +import 'package:PiliPlus/pages/member_dynamics/view.dart'; +import 'package:PiliPlus/pages/member_profile/view.dart'; +import 'package:PiliPlus/pages/member_search/view.dart'; +import 'package:PiliPlus/pages/msg_feed_top/sys_msg/view.dart'; +import 'package:PiliPlus/pages/search/view.dart'; +import 'package:PiliPlus/pages/search_result/view.dart'; import 'package:PiliPlus/pages/search_trending/view.dart'; +import 'package:PiliPlus/pages/setting/extra_setting.dart'; import 'package:PiliPlus/pages/setting/navigation_bar_set.dart'; -import 'package:PiliPlus/pages/setting/search_page.dart'; -import 'package:PiliPlus/pages/setting/sponsor_block_page.dart'; +import 'package:PiliPlus/pages/setting/pages/color_select.dart'; +import 'package:PiliPlus/pages/setting/pages/display_mode.dart'; +import 'package:PiliPlus/pages/setting/pages/font_size_select.dart'; +import 'package:PiliPlus/pages/setting/pages/home_tabbar_set.dart'; +import 'package:PiliPlus/pages/setting/pages/play_speed_set.dart'; +import 'package:PiliPlus/pages/setting/play_setting.dart'; +import 'package:PiliPlus/pages/setting/privacy_setting.dart'; +import 'package:PiliPlus/pages/setting/recommend_setting.dart'; +import 'package:PiliPlus/pages/setting/style_setting.dart'; +import 'package:PiliPlus/pages/setting/video_setting.dart'; +import 'package:PiliPlus/pages/settings_search/view.dart'; +import 'package:PiliPlus/pages/sponsor_block/view.dart'; import 'package:PiliPlus/pages/setting/view.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/create_fav_page.dart'; -import 'package:PiliPlus/pages/video/detail/view_v.dart'; +import 'package:PiliPlus/pages/fav_create/view.dart'; +import 'package:PiliPlus/pages/subscription/view.dart'; +import 'package:PiliPlus/pages/subscription_detail/view.dart'; +import 'package:PiliPlus/pages/video/view.dart'; import 'package:PiliPlus/pages/webdav/view.dart'; -import 'package:PiliPlus/pages/webview/webview_page.dart'; +import 'package:PiliPlus/pages/webview/view.dart'; +import 'package:PiliPlus/pages/whisper/view.dart'; +import 'package:PiliPlus/pages/whisper_detail/view.dart'; import 'package:PiliPlus/utils/storage.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:PiliPlus/pages/msg_feed_top/at_me/view.dart'; import 'package:PiliPlus/pages/msg_feed_top/reply_me/view.dart'; import 'package:PiliPlus/pages/msg_feed_top/like_me/view.dart'; import 'package:PiliPlus/pages/setting/pages/logs.dart'; - -import '../pages/blacklist/view.dart'; -import '../pages/danmaku_block/view.dart'; -import '../pages/dynamics/detail/index.dart'; -import '../pages/dynamics/index.dart'; -import '../pages/fan/index.dart'; -import '../pages/fav_detail/index.dart'; -import '../pages/follow/index.dart'; -import '../pages/history/index.dart'; -import '../pages/home/index.dart'; -import '../pages/hot/index.dart'; -import '../pages/later/index.dart'; -import '../pages/live_room/view.dart'; -import '../pages/login/index.dart'; -import '../pages/media/index.dart'; -import '../pages/member_dynamics/index.dart'; -import '../pages/member_search/index.dart'; -import '../pages/msg_feed_top/sys_msg/view.dart'; -import '../pages/search/index.dart'; -import '../pages/search_result/index.dart'; -import '../pages/setting/extra_setting.dart'; -import '../pages/setting/pages/color_select.dart'; -import '../pages/setting/pages/display_mode.dart'; -import '../pages/setting/pages/font_size_select.dart'; -import '../pages/setting/pages/home_tabbar_set.dart'; -import '../pages/setting/pages/play_speed_set.dart'; -import '../pages/setting/recommend_setting.dart'; -import '../pages/setting/play_setting.dart'; -import '../pages/setting/video_setting.dart'; -import '../pages/setting/privacy_setting.dart'; -import '../pages/setting/style_setting.dart'; -import '../pages/subscription/index.dart'; -import '../pages/subscription_detail/index.dart'; -import '../pages/video/detail/index.dart'; -import '../pages/whisper/index.dart'; -import '../pages/whisper_detail/index.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; class Routes { static final List> getPages = [ @@ -98,7 +96,7 @@ class Routes { // 直播详情 CustomGetPage(name: '/liveRoom', page: () => const LiveRoomPage()), // 用户中心 - CustomGetPage(name: '/member', page: () => const MemberPageNew()), + CustomGetPage(name: '/member', page: () => const MemberPage()), CustomGetPage(name: '/memberSearch', page: () => const MemberSearchPage()), // 推荐流设置 CustomGetPage( diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart index e80d944e6..f2cc36661 100644 --- a/lib/services/audio_handler.dart +++ b/lib/services/audio_handler.dart @@ -1,9 +1,10 @@ import 'package:PiliPlus/models/live/room_info_h5.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:audio_service/audio_service.dart'; import 'package:PiliPlus/models/bangumi/info.dart'; import 'package:PiliPlus/models/video_detail_res.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:get/get_utils/get_utils.dart'; diff --git a/lib/services/audio_session.dart b/lib/services/audio_session.dart index c6c9c59b7..6978f5924 100644 --- a/lib/services/audio_session.dart +++ b/lib/services/audio_session.dart @@ -1,5 +1,6 @@ +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:audio_session/audio_session.dart'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; class AudioSessionHandler { late AudioSession session; diff --git a/lib/services/shutdown_timer_service.dart b/lib/services/shutdown_timer_service.dart index bcfb57721..4298518dc 100644 --- a/lib/services/shutdown_timer_service.dart +++ b/lib/services/shutdown_timer_service.dart @@ -1,7 +1,8 @@ // 定时关闭服务 import 'dart:async'; import 'dart:io'; -import 'package:PiliPlus/plugin/pl_player/index.dart'; +import 'package:PiliPlus/plugin/pl_player/controller.dart'; +import 'package:PiliPlus/plugin/pl_player/models/play_status.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; diff --git a/lib/utils/accounts/account_adapter.dart b/lib/utils/accounts/account_adapter.dart index 2cd28fc79..e43f09024 100644 --- a/lib/utils/accounts/account_adapter.dart +++ b/lib/utils/accounts/account_adapter.dart @@ -1,9 +1,8 @@ +import 'package:PiliPlus/utils/accounts/account.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:cookie_jar/cookie_jar.dart'; import 'package:hive/hive.dart'; -import '../storage.dart'; -import 'account.dart'; - class LoginAccountAdapter extends TypeAdapter { @override final int typeId = 9; diff --git a/lib/utils/accounts/account_manager/account_mgr.dart b/lib/utils/accounts/account_manager/account_mgr.dart index 25891139e..0bc286e3a 100644 --- a/lib/utils/accounts/account_manager/account_mgr.dart +++ b/lib/utils/accounts/account_manager/account_mgr.dart @@ -4,6 +4,7 @@ import 'dart:io'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/constants.dart'; +import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; @@ -12,8 +13,6 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../account.dart'; - final _setCookieReg = RegExp('(?<=)(,)(?=[^;]+?=)'); class AccountManager extends Interceptor { diff --git a/lib/utils/accounts/account_type_adapter.dart b/lib/utils/accounts/account_type_adapter.dart index 94a59be81..b0231e805 100644 --- a/lib/utils/accounts/account_type_adapter.dart +++ b/lib/utils/accounts/account_type_adapter.dart @@ -1,8 +1,7 @@ import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/storage.dart' show AccountType; import 'package:hive/hive.dart'; -import '../storage.dart' show AccountType; - class AccountTypeAdapter extends TypeAdapter { @override final int typeId = 10; diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart index 1a33e3186..0dce83e97 100644 --- a/lib/utils/app_scheme.dart +++ b/lib/utils/app_scheme.dart @@ -1,17 +1,17 @@ import 'dart:async'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/models/common/reply_type.dart'; +import 'package:PiliPlus/pages/video/reply_reply/view.dart'; import 'package:PiliPlus/utils/extension.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/url_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:app_links/app_links.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import '../http/search.dart'; -import '../pages/video/detail/reply_reply/view.dart'; -import 'id_utils.dart'; -import 'url_utils.dart'; -import 'utils.dart'; class PiliScheme { static late AppLinks appLinks; diff --git a/lib/utils/login_utils.dart b/lib/utils/login_utils.dart index e2e200190..3e14937d0 100644 --- a/lib/utils/login_utils.dart +++ b/lib/utils/login_utils.dart @@ -6,17 +6,13 @@ import 'package:PiliPlus/models/common/tab_type.dart' hide tabsConfig; import 'package:PiliPlus/models/user/info.dart'; import 'package:PiliPlus/models/user/stat.dart'; import 'package:PiliPlus/pages/bangumi/controller.dart'; -import 'package:PiliPlus/pages/dynamics/tab/controller.dart'; +import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; import 'package:PiliPlus/pages/live/controller.dart'; import 'package:PiliPlus/pages/main/controller.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; -import 'package:PiliPlus/pages/dynamics/index.dart'; -import 'package:PiliPlus/pages/home/index.dart'; -import 'package:PiliPlus/pages/media/index.dart'; -import 'package:PiliPlus/pages/mine/index.dart'; import 'package:webview_cookie_manager/webview_cookie_manager.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart' as web; import 'package:PiliPlus/pages/dynamics/controller.dart'; diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart index 648b87c3b..ea0701733 100644 --- a/lib/utils/page_utils.dart +++ b/lib/utils/page_utils.dart @@ -9,8 +9,8 @@ import 'package:PiliPlus/models/common/search_type.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/live/item.dart'; import 'package:PiliPlus/pages/contact/view.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/fav_panel.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/menu_row.dart'; +import 'package:PiliPlus/pages/fav_panel/view.dart'; +import 'package:PiliPlus/pages/video/introduction/ugc/widgets/menu_row.dart'; import 'package:PiliPlus/pages/share/view.dart'; import 'package:PiliPlus/services/shutdown_timer_service.dart'; import 'package:PiliPlus/utils/app_scheme.dart'; diff --git a/lib/utils/request_utils.dart b/lib/utils/request_utils.dart index 474f204b5..4d5f29898 100644 --- a/lib/utils/request_utils.dart +++ b/lib/utils/request_utils.dart @@ -14,12 +14,12 @@ import 'package:PiliPlus/http/user.dart'; import 'package:PiliPlus/http/validate.dart'; import 'package:PiliPlus/http/video.dart'; import 'package:PiliPlus/models/dynamics/result.dart'; -import 'package:PiliPlus/models/login/index.dart'; +import 'package:PiliPlus/models/login/model.dart'; import 'package:PiliPlus/models/user/fav_folder.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'; -import 'package:PiliPlus/pages/dynamics/tab/controller.dart'; +import 'package:PiliPlus/pages/dynamics_tab/controller.dart'; import 'package:PiliPlus/pages/later/controller.dart'; -import 'package:PiliPlus/pages/video/detail/introduction/widgets/group_panel.dart'; +import 'package:PiliPlus/pages/group_panel/group_panel.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/feed_back.dart'; import 'package:PiliPlus/utils/storage.dart'; diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 3e1c39a70..80b111ee5 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -18,7 +18,7 @@ import 'package:PiliPlus/models/video/play/CDN.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; import 'package:PiliPlus/models/video/play/subtitle.dart'; import 'package:PiliPlus/pages/member/controller.dart' show MemberTabType; -import 'package:PiliPlus/pages/mine/index.dart'; +import 'package:PiliPlus/pages/mine/controller.dart'; import 'package:PiliPlus/plugin/pl_player/models/bottom_progress_behavior.dart'; import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; diff --git a/lib/utils/url_utils.dart b/lib/utils/url_utils.dart index 40acfd400..8c67d4dac 100644 --- a/lib/utils/url_utils.dart +++ b/lib/utils/url_utils.dart @@ -1,14 +1,13 @@ +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/http/search.dart'; import 'package:PiliPlus/utils/accounts/account.dart'; +import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart'; +import 'package:PiliPlus/utils/utils.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import '../http/init.dart'; -import '../http/search.dart'; -import 'id_utils.dart'; -import 'utils.dart'; - class UrlUtils { // 302重定向路由截取 static Future parseRedirectUrl( diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 23608aeed..8549a3150 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -6,6 +6,9 @@ import 'package:PiliPlus/build_config.dart'; import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/http/api.dart'; import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/models/home/rcmd/result.dart'; +import 'package:PiliPlus/models/model_rec_video_item.dart'; +import 'package:PiliPlus/models/model_video.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/global_data.dart'; import 'package:PiliPlus/utils/page_utils.dart'; @@ -20,10 +23,6 @@ import 'package:share_plus/share_plus.dart'; import 'package:path/path.dart' as path; import 'package:uuid/v4.dart'; -import '../models/home/rcmd/result.dart'; -import '../models/model_rec_video_item.dart'; -import '../models/model_video.dart'; - class Utils { static final Random random = Random(); diff --git a/lib/utils/video_utils.dart b/lib/utils/video_utils.dart index 4224ae2bb..a46518b2d 100644 --- a/lib/utils/video_utils.dart +++ b/lib/utils/video_utils.dart @@ -1,11 +1,10 @@ +import 'package:PiliPlus/models/live/room_info.dart'; import 'package:PiliPlus/models/video/play/CDN.dart'; import 'package:PiliPlus/models/video/play/url.dart'; import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:flutter/material.dart'; -import '../models/live/room_info.dart'; - class VideoUtils { static String getCdnUrl(dynamic item, [defaultCDNService]) { String? backupUrl; diff --git a/lib/utils/wbi_sign.dart b/lib/utils/wbi_sign.dart index f7c831cf7..96b8bd746 100644 --- a/lib/utils/wbi_sign.dart +++ b/lib/utils/wbi_sign.dart @@ -3,12 +3,13 @@ // import md5 from 'md5' // import axios from 'axios' import 'dart:convert'; +import 'package:PiliPlus/http/api.dart'; +import 'package:PiliPlus/http/init.dart'; +import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/utils.dart'; import 'package:crypto/crypto.dart'; import 'package:hive/hive.dart'; import 'package:synchronized/synchronized.dart'; -import '../http/index.dart'; -import 'storage.dart'; class WbiSign { static Box get localCache => GStorage.localCache;