logo和名称替换
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import 'package:hgmj/hj_model/drama_media_info.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/acg_service.dart';
|
||||
import 'package:hgmj/tools_base/debug_log.dart';
|
||||
import 'package:wydj/hj_model/drama_media_info.dart';
|
||||
import 'package:wydj/hj_utils/api_service/acg_service.dart';
|
||||
import 'package:wydj/tools_base/debug_log.dart';
|
||||
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
import '../../../hj_utils/api_service/vid_service.dart';
|
||||
@@ -9,16 +9,15 @@ import 'home_tab_base_logic.dart';
|
||||
/// AI 短剧子 tab:拉 [VidService.getModuleDetail];专题样式(5)按选中专题拉
|
||||
/// [ACGService.getPreferences],否则直接用模块 allMediaInfo。
|
||||
class HomeTabDramaLogic extends HomeTabBaseLogic {
|
||||
|
||||
HomeTabDramaLogic(super.index, super.tabModel, {super.isDarkStyle});
|
||||
|
||||
|
||||
/// 专题样式(5)才走「专题 tab + fetchTopicWorks」;否则直接用 allMediaInfo 无 tab。
|
||||
bool get hasSectionTabs => tabModel.haiJiaoStyle?.sectionStyle == 5;
|
||||
|
||||
bool get isShowMenuTab => hasSectionTabs && allSection.isNotEmpty;
|
||||
|
||||
List<SectionBannerModel> get banners => isShowMenuTab ? (allSection[selectedSection].banners ?? []) : [];
|
||||
List<SectionBannerModel> get banners =>
|
||||
isShowMenuTab ? (allSection[selectedSection].banners ?? []) : [];
|
||||
|
||||
/// 当前选中专题下标
|
||||
int selectedSection = 0;
|
||||
@@ -38,7 +37,8 @@ class HomeTabDramaLogic extends HomeTabBaseLogic {
|
||||
try {
|
||||
isInitData = true;
|
||||
update();
|
||||
dataSource = await VidService.getModuleDetail(tabModel.id ?? '', pageNumber: 1, pageSize: 10, moduleSort: 0);
|
||||
dataSource = await VidService.getModuleDetail(tabModel.id ?? '',
|
||||
pageNumber: 1, pageSize: 10, moduleSort: 0);
|
||||
_loadData(selectedSection);
|
||||
} catch (e) {
|
||||
debugLog(e);
|
||||
@@ -47,7 +47,6 @@ class HomeTabDramaLogic extends HomeTabBaseLogic {
|
||||
update();
|
||||
}
|
||||
|
||||
|
||||
void onInitListData() {
|
||||
videoList = null;
|
||||
update();
|
||||
@@ -76,23 +75,30 @@ class HomeTabDramaLogic extends HomeTabBaseLogic {
|
||||
}
|
||||
|
||||
/// 第一步:拉模块详情;完成后按样式进入第二步。
|
||||
Future<void> _loadData(int selectedIndex, {int page = 1, int pageSize = 10}) async {
|
||||
Future<void> _loadData(int selectedIndex,
|
||||
{int page = 1, int pageSize = 10}) async {
|
||||
try {
|
||||
bool hasNext = false;
|
||||
List<DramaMediaInfo> retArr = [];
|
||||
if (hasSectionTabs) {
|
||||
final sectionId = _selectedSectionId;
|
||||
final res = await ACGService.getPreferences(page, pageSize, sId: sectionId, type: null);
|
||||
if(sectionId != _selectedSectionId){
|
||||
final res = await ACGService.getPreferences(page, pageSize,
|
||||
sId: sectionId, type: null);
|
||||
if (sectionId != _selectedSectionId) {
|
||||
//切换菜单了,数据直接丢弃
|
||||
return;
|
||||
}
|
||||
retArr = res?.list?.map((e) => e.toDramaMediaInfo()).toList() ?? [];
|
||||
hasNext = res?.hasNext ?? false;
|
||||
} else {
|
||||
ModuleDetailModel? detail =
|
||||
await VidService.getModuleDetail(tabModel.id ?? '', pageNumber: page, pageSize: pageSize, moduleSort: 0);
|
||||
retArr = detail?.allMediaInfo?.map((e) => e.toDramaMediaInfo()).toList() ?? [];
|
||||
ModuleDetailModel? detail = await VidService.getModuleDetail(
|
||||
tabModel.id ?? '',
|
||||
pageNumber: page,
|
||||
pageSize: pageSize,
|
||||
moduleSort: 0);
|
||||
retArr =
|
||||
detail?.allMediaInfo?.map((e) => e.toDramaMediaInfo()).toList() ??
|
||||
[];
|
||||
hasNext = detail?.hasNext ?? false;
|
||||
}
|
||||
videoList ??= [];
|
||||
@@ -114,5 +120,4 @@ class HomeTabDramaLogic extends HomeTabBaseLogic {
|
||||
}
|
||||
update();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/home/plate_model.dart';
|
||||
import 'package:hgmj/hj_page/home/home_cell_style/drama_banner.dart';
|
||||
import 'package:hgmj/hj_page/home/home_cell_style/drama_cover_card.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:hgmj/tools_base/refresh/pull_refresh.dart';
|
||||
import 'package:hgmj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:wydj/hj_model/home/plate_model.dart';
|
||||
import 'package:wydj/hj_page/home/home_cell_style/drama_banner.dart';
|
||||
import 'package:wydj/hj_page/home/home_cell_style/drama_cover_card.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/refresh/pull_refresh.dart';
|
||||
import 'package:wydj/tools_base/unique_tag_mixin.dart';
|
||||
|
||||
import 'home_tab_drama_logic.dart';
|
||||
|
||||
@@ -26,11 +26,13 @@ class HomeTabDramaPage extends StatefulWidget {
|
||||
State<HomeTabDramaPage> createState() => _HomeTabDramaPageState();
|
||||
}
|
||||
|
||||
class _HomeTabDramaPageState extends State<HomeTabDramaPage> with UniqueTagMixin {
|
||||
class _HomeTabDramaPageState extends State<HomeTabDramaPage>
|
||||
with UniqueTagMixin {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GetBuilder<HomeTabDramaLogic>(
|
||||
init: HomeTabDramaLogic(widget.tabIndex, widget.tabModel, isDarkStyle: widget.isDarkStyle),
|
||||
init: HomeTabDramaLogic(widget.tabIndex, widget.tabModel,
|
||||
isDarkStyle: widget.isDarkStyle),
|
||||
tag: uniqueTag,
|
||||
builder: (logic) {
|
||||
if (logic.isInitData) {
|
||||
@@ -99,10 +101,13 @@ class _HomeTabDramaPageState extends State<HomeTabDramaPage> with UniqueTagMixin
|
||||
return GestureDetector(
|
||||
onTap: () => logic.selectSection(i),
|
||||
child: Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: selected ? 12 : 8, vertical: 4),
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: selected ? 12 : 8, vertical: 4),
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: selected ? const Color(0xFFFFC000) : const Color(0x0DFFFFFF),
|
||||
color: selected
|
||||
? const Color(0xFFFFC000)
|
||||
: const Color(0x0DFFFFFF),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
),
|
||||
child: Text(
|
||||
@@ -111,7 +116,9 @@ class _HomeTabDramaPageState extends State<HomeTabDramaPage> with UniqueTagMixin
|
||||
fontSize: 12,
|
||||
height: 18 / 12,
|
||||
fontWeight: selected ? FontWeight.w500 : FontWeight.w400,
|
||||
color: selected ? const Color(0xFF292929) : const Color(0x8CFFFFFF),
|
||||
color: selected
|
||||
? const Color(0xFF292929)
|
||||
: const Color(0x8CFFFFFF),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'package:hgmj/tools_base/ad_manager.dart';
|
||||
import 'package:wydj/tools_base/ad_manager.dart';
|
||||
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
import '../../../hj_utils/api_service/vid_service.dart';
|
||||
@@ -57,10 +57,14 @@ class HomeTabSectionLogic extends HomeTabBaseLogic {
|
||||
|
||||
void _loadData({int page = 1, int size = 5}) async {
|
||||
try {
|
||||
ModuleDetailModel? retResp = await VidService.getModuleDetail(tabModel.id ?? '', pageNumber: page, pageSize: size);
|
||||
ModuleDetailModel? retResp = await VidService.getModuleDetail(
|
||||
tabModel.id ?? '',
|
||||
pageNumber: page,
|
||||
pageSize: size);
|
||||
|
||||
currentPage = page;
|
||||
retResp?.allSection?.removeWhere((element) => element.allVideoInfo?.isEmpty ?? true);
|
||||
retResp?.allSection
|
||||
?.removeWhere((element) => element.allVideoInfo?.isEmpty ?? true);
|
||||
if (currentPage == 1) {
|
||||
dataSource = retResp;
|
||||
} else {
|
||||
@@ -109,7 +113,8 @@ class HomeTabSectionLogic extends HomeTabBaseLogic {
|
||||
try {
|
||||
AllSection lastSection = allSection.last;
|
||||
int sortValue = gLikeSortParam[sortType];
|
||||
AllSection? retModel = await VidService.getGuessLike(page, size, tabModel.id ?? "", sortValue);
|
||||
AllSection? retModel = await VidService.getGuessLike(
|
||||
page, size, tabModel.id ?? "", sortValue);
|
||||
if (sortType != guessLikeSortType) {
|
||||
return;
|
||||
}
|
||||
@@ -119,7 +124,9 @@ class HomeTabSectionLogic extends HomeTabBaseLogic {
|
||||
lastSection.allVideoInfo?.clear();
|
||||
}
|
||||
lastSection.allVideoInfo?.addAll(retModel?.allVideoInfo ?? []);
|
||||
retModel?.hasNext == false ? refreshCtr?.loadNoData() : refreshCtr?.loadComplete();
|
||||
retModel?.hasNext == false
|
||||
? refreshCtr?.loadNoData()
|
||||
: refreshCtr?.loadComplete();
|
||||
} catch (e) {
|
||||
refreshCtr?.loadComplete();
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
|
||||
import '../../../hj_model/home/plate_model.dart';
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
import '../../../tools_base/banner/ads_grid_view.dart';
|
||||
import '../../../tools_base/refresh/pull_refresh.dart';
|
||||
import 'package:hgmj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:wydj/tools_base/unique_tag_mixin.dart';
|
||||
import '../home_cell_style/guess_like_sliver.dart';
|
||||
import '../home_cell_style/quick_entry_row.dart';
|
||||
import '../home_cell_style/home_section_cell.dart';
|
||||
@@ -29,11 +29,13 @@ class HomeTabSectionPage extends StatefulWidget {
|
||||
State<HomeTabSectionPage> createState() => _HomeTabSectionPageState();
|
||||
}
|
||||
|
||||
class _HomeTabSectionPageState extends State<HomeTabSectionPage> with UniqueTagMixin {
|
||||
class _HomeTabSectionPageState extends State<HomeTabSectionPage>
|
||||
with UniqueTagMixin {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GetBuilder<HomeTabSectionLogic>(
|
||||
init: HomeTabSectionLogic(widget.tabIndex, widget.tabModel, isDarkStyle: widget.isDarkStyle),
|
||||
init: HomeTabSectionLogic(widget.tabIndex, widget.tabModel,
|
||||
isDarkStyle: widget.isDarkStyle),
|
||||
tag: uniqueTag,
|
||||
builder: (logic) {
|
||||
return Container(
|
||||
@@ -91,7 +93,8 @@ class _HomeTabSectionPageState extends State<HomeTabSectionPage> with UniqueTagM
|
||||
ads: section.adsInfoArr ?? [],
|
||||
padding: EdgeInsets.fromLTRB(12, 0, 12, 16),
|
||||
);
|
||||
} else if (logic.lastIsGuessLike && index == logic.allSection.length - 1) {
|
||||
} else if (logic.lastIsGuessLike &&
|
||||
index == logic.allSection.length - 1) {
|
||||
return SizedBox(); // 最后一个猜你喜欢列表单独处理
|
||||
} else if (section.allVideoInfo?.isNotEmpty == true) {
|
||||
//换一批、间距、分割线都在 HomeSectionCell 里
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/home/video_list_model.dart';
|
||||
import 'package:hgmj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:hgmj/hj_utils/const.dart';
|
||||
import 'package:wydj/hj_model/home/video_list_model.dart';
|
||||
import 'package:wydj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:wydj/hj_utils/const.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
import '../../../hj_model/home/module_detail_model.dart';
|
||||
@@ -37,7 +37,8 @@ class HomeTabSortLogic extends HomeTabBaseLogic {
|
||||
SortTab('本月最热', 4),
|
||||
SortTab('年度最热', 5),
|
||||
];
|
||||
List<String> get lastestSortTitles => _lastestSortTabs.map((e) => e.name).toList();
|
||||
List<String> get lastestSortTitles =>
|
||||
_lastestSortTabs.map((e) => e.name).toList();
|
||||
int lastestModuleSort = 1;
|
||||
|
||||
// 一排几个:haiJiaoStyle.defaultShow 0-一排两个(网格) 1-一排一个(单列),缺省按网格
|
||||
@@ -99,12 +100,18 @@ class HomeTabSortLogic extends HomeTabBaseLogic {
|
||||
}
|
||||
|
||||
void loadMoreData() {
|
||||
_loadData(page: currentPage + 1, sortValue: isNewestStyle ? lastestModuleSort : moduleSort);
|
||||
_loadData(
|
||||
page: currentPage + 1,
|
||||
sortValue: isNewestStyle ? lastestModuleSort : moduleSort);
|
||||
}
|
||||
|
||||
// 每页固定 30:随机刷新接口也传同一个 size,分页偏移才对齐不重叠
|
||||
// [refreshToken] 非空 = 走热门随机刷新接口,只换视频列表
|
||||
void _loadData({int page = 1, int size = 30, int sortValue = 0, String? refreshToken}) async {
|
||||
void _loadData(
|
||||
{int page = 1,
|
||||
int size = 30,
|
||||
int sortValue = 0,
|
||||
String? refreshToken}) async {
|
||||
final seq = ++_reqSeq;
|
||||
try {
|
||||
bool hasNext = false;
|
||||
@@ -142,8 +149,11 @@ class HomeTabSortLogic extends HomeTabBaseLogic {
|
||||
currentPage = 1; // 刷新成功才重置页码,下次上拉从 pageNumber=2 开始
|
||||
}
|
||||
} else {
|
||||
ModuleDetailModel? retResp =
|
||||
await VidService.getModuleDetail(tabModel.id ?? '', moduleSort: sortValue, pageNumber: page, pageSize: size);
|
||||
ModuleDetailModel? retResp = await VidService.getModuleDetail(
|
||||
tabModel.id ?? '',
|
||||
moduleSort: sortValue,
|
||||
pageNumber: page,
|
||||
pageSize: size);
|
||||
if (seq != _reqSeq) return; // 已被更新的请求取代,本次结果作废
|
||||
|
||||
currentPage = page;
|
||||
@@ -159,7 +169,9 @@ class HomeTabSortLogic extends HomeTabBaseLogic {
|
||||
globalStore.filterShowType(dataSource?.allVideoInfo ?? []);
|
||||
dataSource?.allVideoInfo?.removeWhere((element) => element.isRandomAd());
|
||||
if (isShowAd) {
|
||||
AdManager().insertGroupAds(dataSource?.allVideoInfo ?? [], AdManager().adsByType(11), adGap: 6);
|
||||
AdManager().insertGroupAds(
|
||||
dataSource?.allVideoInfo ?? [], AdManager().adsByType(11),
|
||||
adGap: 6);
|
||||
}
|
||||
hasNext ? refreshCtr?.loadComplete() : refreshCtr?.loadNoData();
|
||||
} catch (e) {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/routers/jump_router.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:hgmj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/routers/jump_router.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/unique_tag_mixin.dart';
|
||||
|
||||
import '../../../hj_model/cartoon_media_info.dart';
|
||||
import '../../../hj_model/home/plate_model.dart';
|
||||
@@ -40,7 +40,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GetBuilder<HomeTabSortLogic>(
|
||||
init: HomeTabSortLogic(widget.tabIndex, widget.tabModel, isDarkStyle: widget.isDarkStyle),
|
||||
init: HomeTabSortLogic(widget.tabIndex, widget.tabModel,
|
||||
isDarkStyle: widget.isDarkStyle),
|
||||
tag: uniqueTag,
|
||||
builder: (logic) {
|
||||
return Stack(
|
||||
@@ -71,7 +72,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
isDarkStyle: widget.isDarkStyle,
|
||||
),
|
||||
),
|
||||
if (widget.tabModel.haiJiaoStyle?.sortShow == 1 || logic.isNewestStyle)
|
||||
if (widget.tabModel.haiJiaoStyle?.sortShow == 1 ||
|
||||
logic.isNewestStyle)
|
||||
SliverPersistentHeader(
|
||||
pinned: true,
|
||||
delegate: MySliverDelegate(
|
||||
@@ -79,12 +81,14 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
minHeight: 42,
|
||||
callTop: (shrinkOffset) {
|
||||
if (shrinkOffset > 0) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
WidgetsBinding.instance
|
||||
.addPostFrameCallback((timeStamp) {
|
||||
logic.isSortMenuInTop.value = false;
|
||||
});
|
||||
}
|
||||
if (shrinkOffset <= 0) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
WidgetsBinding.instance
|
||||
.addPostFrameCallback((timeStamp) {
|
||||
logic.isSortMenuInTop.value = true;
|
||||
});
|
||||
}
|
||||
@@ -103,11 +107,16 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
}
|
||||
return HomeSortHeader(
|
||||
isLatest: logic.isNewestStyle,
|
||||
labelPadding: const EdgeInsets.symmetric(horizontal: 10),
|
||||
tabs: logic.isNewestStyle ? logic.lastestSortTitles : logic.sortTitles,
|
||||
labelPadding:
|
||||
const EdgeInsets.symmetric(horizontal: 10),
|
||||
tabs: logic.isNewestStyle
|
||||
? logic.lastestSortTitles
|
||||
: logic.sortTitles,
|
||||
bgColor: bgColor,
|
||||
onSort: logic.sortMenuEvent,
|
||||
rightWidget: logic.isNewestStyle ? null : _buildSortStyleMenu(logic),
|
||||
rightWidget: logic.isNewestStyle
|
||||
? null
|
||||
: _buildSortStyleMenu(logic),
|
||||
);
|
||||
},
|
||||
),
|
||||
@@ -143,9 +152,12 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
2.sizeBoxW,
|
||||
AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 300),
|
||||
transitionBuilder: (child, anim) => ScaleTransition(scale: anim, child: child),
|
||||
transitionBuilder: (child, anim) =>
|
||||
ScaleTransition(scale: anim, child: child),
|
||||
child: Image.asset(
|
||||
logic.isGridStyle.value ? 'list_style.webp'.homePath : 'grid_style.webp'.homePath,
|
||||
logic.isGridStyle.value
|
||||
? 'list_style.webp'.homePath
|
||||
: 'grid_style.webp'.homePath,
|
||||
key: ValueKey(logic.isGridStyle.value),
|
||||
width: 18,
|
||||
),
|
||||
@@ -206,7 +218,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
crossAxisCount: logic.isGridStyle.value ? 2 : 1,
|
||||
mainAxisSpacing: logic.isGridStyle.value ? 12 : 14,
|
||||
crossAxisSpacing: 7,
|
||||
childAspectRatio: logic.isGridStyle.value ? 168 / 134 : 340 / 215, //子控件宽高比
|
||||
childAspectRatio:
|
||||
logic.isGridStyle.value ? 168 / 134 : 340 / 215, //子控件宽高比
|
||||
),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
@@ -237,7 +250,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
int leftCount = logic.allVideo.length % gapValue;
|
||||
int insertIndex = 0;
|
||||
for (int i = 0; i < allIndex; i++) {
|
||||
List<VideoModel> subList = logic.allVideo.sublist(i * gapValue, i * gapValue + gapValue);
|
||||
List<VideoModel> subList =
|
||||
logic.allVideo.sublist(i * gapValue, i * gapValue + gapValue);
|
||||
slivers.add(SliverPadding(
|
||||
padding: EdgeInsets.only(bottom: 12),
|
||||
sliver: SliverGrid(
|
||||
@@ -245,7 +259,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
crossAxisCount: logic.isGridStyle.value ? 2 : 1,
|
||||
mainAxisSpacing: logic.isGridStyle.value ? 10 : 12,
|
||||
crossAxisSpacing: 7,
|
||||
childAspectRatio: logic.isGridStyle.value ? 168 / 134 : 343 / 215, //子控件宽高比
|
||||
childAspectRatio:
|
||||
logic.isGridStyle.value ? 168 / 134 : 343 / 215, //子控件宽高比
|
||||
),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
@@ -281,7 +296,8 @@ class _HomeTabSortPageState extends State<HomeTabSortPage> with UniqueTagMixin {
|
||||
crossAxisCount: logic.isGridStyle.value ? 2 : 1,
|
||||
mainAxisSpacing: logic.isGridStyle.value ? 10 : 12,
|
||||
crossAxisSpacing: 7,
|
||||
childAspectRatio: logic.isGridStyle.value ? 168 / 134 : 343 / 215, //子控件宽高比
|
||||
childAspectRatio:
|
||||
logic.isGridStyle.value ? 168 / 134 : 343 / 215, //子控件宽高比
|
||||
),
|
||||
delegate: SliverChildBuilderDelegate(
|
||||
(context, index) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/hj_page/home/provider/home_update_marker_provider.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
/// 首页模块的排序切换栏(热门推荐 / 最新上架 / ...)
|
||||
@@ -27,9 +27,12 @@ class HomeSortHeader extends StatefulWidget {
|
||||
State<HomeSortHeader> createState() => _HomeSortHeaderState();
|
||||
}
|
||||
|
||||
class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProviderStateMixin {
|
||||
late final List<String> tabs = widget.tabs ?? const ['热门推荐', '最新上架', '最新热评', '最多收藏'];
|
||||
late final TabController tabCtr = TabController(length: tabs.length, vsync: this);
|
||||
class _HomeSortHeaderState extends State<HomeSortHeader>
|
||||
with SingleTickerProviderStateMixin {
|
||||
late final List<String> tabs =
|
||||
widget.tabs ?? const ['热门推荐', '最新上架', '最新热评', '最多收藏'];
|
||||
late final TabController tabCtr =
|
||||
TabController(length: tabs.length, vsync: this);
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
@@ -41,7 +44,7 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
Widget build(BuildContext context) {
|
||||
if (widget.isLatest) {
|
||||
return _buildNewsetsStyle();
|
||||
}else {
|
||||
} else {
|
||||
return Container(
|
||||
height: 38,
|
||||
color: widget.bgColor ?? Theme.of(context).scaffoldBackgroundColor,
|
||||
@@ -60,13 +63,15 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
onTap: widget.onSort,
|
||||
indicatorWeight: 0,
|
||||
indicator: const BoxDecoration(),
|
||||
labelPadding: widget.labelPadding ?? const EdgeInsets.symmetric(horizontal: 8),
|
||||
labelPadding:
|
||||
widget.labelPadding ?? const EdgeInsets.symmetric(horizontal: 8),
|
||||
labelStyle: const TextStyle(
|
||||
color: Color(0xE5FFFFFF),
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
unselectedLabelStyle: const TextStyle(color: Color(0x8CFFFFFF), fontSize: 14),
|
||||
unselectedLabelStyle:
|
||||
const TextStyle(color: Color(0x8CFFFFFF), fontSize: 14),
|
||||
tabs: List.generate(tabs.length, (i) => Text(tabs[i])),
|
||||
);
|
||||
}
|
||||
@@ -82,20 +87,21 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
tabAlignment: TabAlignment.center,
|
||||
onTap: widget.onSort,
|
||||
indicatorWeight: 0,
|
||||
indicator: BoxDecoration(color: AppColors.actionRed, borderRadius: BorderRadius.circular(3)),
|
||||
indicator: BoxDecoration(
|
||||
color: AppColors.actionRed, borderRadius: BorderRadius.circular(3)),
|
||||
labelPadding: const EdgeInsets.symmetric(horizontal: 6),
|
||||
labelStyle: const TextStyle(
|
||||
color: Color(0xff1F2029),
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
unselectedLabelStyle: const TextStyle(color: Color(0x8CFFFFFF), fontSize: 12),
|
||||
unselectedLabelStyle:
|
||||
const TextStyle(color: Color(0x8CFFFFFF), fontSize: 12),
|
||||
tabs: List.generate(tabs.length, (i) => _latestTab(i, tabs[i])),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/// 红点只落在「最新」页首个 tab,只让它订阅 provider
|
||||
Widget _latestTab(int index, String label) {
|
||||
final text = Padding(
|
||||
@@ -109,7 +115,10 @@ class _HomeSortHeaderState extends State<HomeSortHeader> with SingleTickerProvid
|
||||
children: [
|
||||
text,
|
||||
if (marker.showTodayLatestDot)
|
||||
Positioned(right: 4, top: 0, child: HomeUpdateMarkerProvider.buildRedDot()),
|
||||
Positioned(
|
||||
right: 4,
|
||||
top: 0,
|
||||
child: HomeUpdateMarkerProvider.buildRedDot()),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_model/home/plate_model.dart';
|
||||
import 'package:hgmj/hj_model/home/module_detail_model.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/refresh/horizontal_load_more.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_model/home/plate_model.dart';
|
||||
import 'package:wydj/hj_model/home/module_detail_model.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/refresh/horizontal_load_more.dart';
|
||||
|
||||
import '../../../../tools_base/widget/net_image_widget.dart';
|
||||
import '../../../cartoon/cartoon_sectionlist_page.dart';
|
||||
@@ -55,7 +55,8 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
/// 注:原创达人区不走这里,它固定进专题详情(见 [_actressSection])
|
||||
void _onTap(AllSection model) {
|
||||
if (module?.isACG == true) {
|
||||
Get.to(CartoonSectionListPage(sectionID: model.sectionID, tagName: model.sectionName));
|
||||
Get.to(CartoonSectionListPage(
|
||||
sectionID: model.sectionID, tagName: model.sectionName));
|
||||
} else {
|
||||
Get.to(SpecialTopicsDetailPage(model), preventDuplicates: false);
|
||||
}
|
||||
@@ -63,7 +64,8 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
|
||||
// ========== 样式 1 / 5:圆头像横滑 ==========
|
||||
|
||||
Widget _avatarRow(List<AllSection> list, {required double height, required double imgSize}) {
|
||||
Widget _avatarRow(List<AllSection> list,
|
||||
{required double height, required double imgSize}) {
|
||||
return Container(
|
||||
margin: padding,
|
||||
height: height,
|
||||
@@ -111,7 +113,10 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
Text(
|
||||
list.first.sectionName ?? "",
|
||||
maxLines: 1,
|
||||
style: const TextStyle(color: Color(0xE5FFFFFF), fontSize: 18, fontWeight: FontWeight.w500),
|
||||
style: const TextStyle(
|
||||
color: Color(0xE5FFFFFF),
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w500),
|
||||
),
|
||||
_avatarRow(list, height: 84, imgSize: 55),
|
||||
],
|
||||
@@ -143,21 +148,31 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
width: double.infinity,
|
||||
height: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: isDarkStyle ? const Color(0x4D810906) : const Color(0x0DFFFFFF),
|
||||
color:
|
||||
isDarkStyle ? const Color(0x4D810906) : const Color(0x0DFFFFFF),
|
||||
borderRadius: const BorderRadius.all(Radius.circular(2)),
|
||||
),
|
||||
child: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
if (isDarkStyle) Positioned(top: 0, child: Image.asset("aw_tag.webp".homePath, height: 13)),
|
||||
if (isDarkStyle)
|
||||
Positioned(
|
||||
top: 0,
|
||||
child: Image.asset("aw_tag.webp".homePath, height: 13)),
|
||||
Text(
|
||||
"${model.sectionName}",
|
||||
style: const TextStyle(color: Color(0xE5FFFFFF), fontSize: 12, fontWeight: FontWeight.w500),
|
||||
style: const TextStyle(
|
||||
color: Color(0xE5FFFFFF),
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (model.hot == true)
|
||||
Positioned(top: 0, right: 0, child: Image.asset("home_hot.webp".homePath, height: 20)),
|
||||
Positioned(
|
||||
top: 0,
|
||||
right: 0,
|
||||
child: Image.asset("home_hot.webp".homePath, height: 20)),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -182,11 +197,16 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
child: Text(
|
||||
'原创达人',
|
||||
maxLines: 1,
|
||||
style: TextStyle(color: Color(0xE5FFFFFF), fontSize: 18, fontWeight: FontWeight.w600),
|
||||
style: TextStyle(
|
||||
color: Color(0xE5FFFFFF),
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w600),
|
||||
),
|
||||
),
|
||||
10.sizeBoxW,
|
||||
const Text('更多', maxLines: 1, style: TextStyle(color: Color(0x59FFFFFF), fontSize: 12)),
|
||||
const Text('更多',
|
||||
maxLines: 1,
|
||||
style: TextStyle(color: Color(0x59FFFFFF), fontSize: 12)),
|
||||
Image.asset("arrow_right_grey.webp".commonImgPath, width: 18),
|
||||
],
|
||||
),
|
||||
@@ -221,7 +241,8 @@ class SpecialTopicsView extends StatelessWidget {
|
||||
Widget _actressItem(AllSection model, double itemW) {
|
||||
return GestureDetector(
|
||||
//达人固定进专题详情,不走 _onTap 的漫画分支
|
||||
onTap: () => Get.to(SpecialTopicsDetailPage(model), preventDuplicates: false),
|
||||
onTap: () =>
|
||||
Get.to(SpecialTopicsDetailPage(model), preventDuplicates: false),
|
||||
child: SizedBox(
|
||||
height: double.infinity,
|
||||
width: itemW,
|
||||
|
||||
Reference in New Issue
Block a user