EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-30 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: search dyn

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-04-09 10:59:18 +08:00
parent 03830533eb
commit 1202e5ec0f
6 changed files with 98 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/http/member.dart
View File

@@ -447,8 +447,7 @@ class MemberHttp {
if (res.data['code'] == 0) { if (res.data['code'] == 0) {
return { return {
'status': true, 'status': true,
'data': DynamicsDataModel.fromJson(res.data['data']).items, 'data': DynamicsDataModel.fromJson(res.data['data']),
'count': res.data['data']?['total'],
}; };
} else { } else {
return { return {

3
lib/models/dynamics/result.dart
View File

@@ -7,10 +7,12 @@ class DynamicsDataModel {
this.hasMore, this.hasMore,
this.items, this.items,
this.offset, this.offset,
this.total,
}); });
bool? hasMore; bool? hasMore;
List<DynamicItemModel>? items; List<DynamicItemModel>? items;
String? offset; String? offset;
int? total;
DynamicsDataModel.fromJson(Map<String, dynamic> json) { DynamicsDataModel.fromJson(Map<String, dynamic> json) {
hasMore = json['has_more']; hasMore = json['has_more'];
@@ -18,6 +20,7 @@ class DynamicsDataModel {
?.map<DynamicItemModel>((e) => DynamicItemModel.fromJson(e)) ?.map<DynamicItemModel>((e) => DynamicItemModel.fromJson(e))
.toList(); .toList();
offset = json['offset']; offset = json['offset'];
total = json['total'];
} }
} }

126
lib/pages/dynamics/tab/view.dart
View File

@@ -130,70 +130,76 @@ class _DynamicsTabPageState
return switch (loadingState) { return switch (loadingState) {
Loading() => skeleton(), Loading() => skeleton(),
Success() => (loadingState.response as List?)?.isNotEmpty == true Success() => (loadingState.response as List?)?.isNotEmpty == true
? dynamicsWaterfallFlow ? SliverPadding(
? SliverWaterfallFlow.extent( padding: EdgeInsets.only(
maxCrossAxisExtent: Grid.smallCardWidth * 2, bottom: MediaQuery.paddingOf(context).bottom + 80,
//cacheExtent: 0.0, ),
crossAxisSpacing: StyleString.cardSpace / 2, sliver: dynamicsWaterfallFlow
// mainAxisSpacing: StyleString.cardSpace / 2, ? SliverWaterfallFlow.extent(
maxCrossAxisExtent: Grid.smallCardWidth * 2,
//cacheExtent: 0.0,
crossAxisSpacing: StyleString.cardSpace / 2,
// mainAxisSpacing: StyleString.cardSpace / 2,
lastChildLayoutTypeBuilder: (index) { lastChildLayoutTypeBuilder: (index) {
if (index == loadingState.response.length - 1) { if (index == loadingState.response.length - 1) {
controller.onLoadMore(); controller.onLoadMore();
} }
return index == loadingState.response.length return index == loadingState.response.length
? LastChildLayoutType.foot ? LastChildLayoutType.foot
: LastChildLayoutType.none; : LastChildLayoutType.none;
}, },
children: [ children: [
if (dynamicsController.tabController.index == 4 && if (dynamicsController.tabController.index == 4 &&
dynamicsController.mid.value != -1) ...[ dynamicsController.mid.value != -1) ...[
for (var i in loadingState.response) for (var i in loadingState.response)
DynamicPanel( DynamicPanel(
item: i, item: i,
onRemove: controller.onRemove, onRemove: controller.onRemove,
), ),
] else ...[ ] else ...[
for (var i in loadingState.response) for (var i in loadingState.response)
if (!dynamicsController.tempBannedList if (!dynamicsController.tempBannedList
.contains(i.modules?.moduleAuthor?.mid)) .contains(i.modules?.moduleAuthor?.mid))
DynamicPanel( DynamicPanel(
item: i, item: i,
onRemove: controller.onRemove,
),
]
],
)
: SliverCrossAxisGroup(
slivers: [
const SliverFillRemaining(),
SliverConstrainedCrossAxis(
maxExtent: Grid.smallCardWidth * 2,
sliver: SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {
if (index == loadingState.response.length - 1) {
controller.onLoadMore();
}
if ((dynamicsController.tabController.index == 4 &&
dynamicsController.mid.value != -1) ||
!dynamicsController.tempBannedList.contains(
loadingState.response[index].modules
?.moduleAuthor?.mid)) {
return DynamicPanel(
item: loadingState.response[index],
onRemove: controller.onRemove, onRemove: controller.onRemove,
); ),
} ]
return const SizedBox.shrink(); ],
}, )
childCount: loadingState.response.length, : SliverCrossAxisGroup(
slivers: [
const SliverFillRemaining(),
SliverConstrainedCrossAxis(
maxExtent: Grid.smallCardWidth * 2,
sliver: SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {
if (index == loadingState.response.length - 1) {
controller.onLoadMore();
}
if ((dynamicsController.tabController.index ==
4 &&
dynamicsController.mid.value != -1) ||
!dynamicsController.tempBannedList.contains(
loadingState.response[index].modules
?.moduleAuthor?.mid)) {
return DynamicPanel(
item: loadingState.response[index],
onRemove: controller.onRemove,
);
}
return const SizedBox.shrink();
},
childCount: loadingState.response.length,
),
),
), ),
), const SliverFillRemaining(),
],
), ),
const SliverFillRemaining(), )
],
)
: HttpError( : HttpError(
callback: controller.onReload, callback: controller.onReload,
), ),

2
lib/pages/member_dynamics/view.dart
View File

@@ -78,7 +78,7 @@ class _MemberDynamicsPageState extends State<MemberDynamicsPage>
Success() => (loadingState.response as List?)?.isNotEmpty == true Success() => (loadingState.response as List?)?.isNotEmpty == true
? SliverPadding( ? SliverPadding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: MediaQuery.paddingOf(context).bottom, bottom: MediaQuery.paddingOf(context).bottom + 80,
), ),
sliver: dynamicsWaterfallFlow sliver: dynamicsWaterfallFlow
? SliverWaterfallFlow.extent( ? SliverWaterfallFlow.extent(

39
lib/pages/member_search/controller.dart
View File

@@ -1,4 +1,6 @@
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/dynamics/result.dart';
import 'package:PiliPlus/models/member/archive.dart';
import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/utils.dart'; import 'package:PiliPlus/utils/utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -88,18 +90,24 @@ class MemberSearchController extends GetxController
keyword: textEditingController.text, keyword: textEditingController.text,
); );
if (res['status']) { if (res['status']) {
DynamicsDataModel data = res['data'];
if (data.hasMore == false || data.items.isNullOrEmpty) {
isEndDynamic = true;
}
if (isRefresh) { if (isRefresh) {
dynamicCount.value = res['count'] ?? -1; dynamicCount.value = data.total ?? 0;
} }
offset = data.offset ?? '';
if (isRefresh.not && dynamicState.value is Success) { if (isRefresh.not && dynamicState.value is Success) {
res['data'].insertAll(0, (dynamicState.value as Success).response); data.items ??= <DynamicItemModel>[];
data.items!.insertAll(0, (dynamicState.value as Success).response);
} }
dynamicState.value = LoadingState.success(res['data']); if (!isEndDynamic && (data.items?.length ?? 0) >= dynamicCount.value) {
if (res['data'].length >= dynamicCount.value) {
isEndDynamic = true; isEndDynamic = true;
} }
dynamicPn++; dynamicPn++;
} else { dynamicState.value = LoadingState.success(data.items);
} else if (isRefresh) {
dynamicState.value = LoadingState.error(res['msg']); dynamicState.value = LoadingState.error(res['msg']);
} }
} }
@@ -115,21 +123,26 @@ class MemberSearchController extends GetxController
wwebid: wwebid, wwebid: wwebid,
); );
if (res['status']) { if (res['status']) {
MemberArchiveDataModel data = res['data'];
if (isRefresh) { if (isRefresh) {
archiveCount.value = res['data'].page['count']; archiveCount.value = data.page?['count'] ?? 0;
}
if (data.list == null || data.list!.vlist.isNullOrEmpty) {
isEndArchive = true;
} }
if (isRefresh.not && archiveState.value is Success) { if (isRefresh.not && archiveState.value is Success) {
res['data'] data.list ??= ArchiveListModel();
.list data.list!.vlist ??= <VListItemModel>[];
.vlist data.list!.vlist!
?.insertAll(0, (archiveState.value as Success).response); .insertAll(0, (archiveState.value as Success).response);
} }
archiveState.value = LoadingState.success(res['data'].list.vlist); if (!isEndArchive &&
if (res['data'].list.vlist.length >= archiveCount.value) { (data.list?.vlist?.length ?? 0) >= archiveCount.value) {
isEndArchive = true; isEndArchive = true;
} }
archivePn++; archivePn++;
} else { archiveState.value = LoadingState.success(data.list?.vlist);
} else if (isRefresh) {
archiveState.value = LoadingState.error(res['msg']); archiveState.value = LoadingState.error(res['msg']);
} }
} }

54
lib/pages/member_search/search_dynamic.dart
View File

@@ -1,14 +1,11 @@
import 'package:PiliPlus/common/constants.dart'; import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/common/widgets/loading_widget.dart'; import 'package:PiliPlus/common/widgets/loading_widget.dart';
import 'package:PiliPlus/common/widgets/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart'; import 'package:PiliPlus/pages/dynamics/widgets/dynamic_panel.dart';
import 'package:PiliPlus/pages/member_search/controller.dart'; import 'package:PiliPlus/pages/member_search/controller.dart';
import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/grid.dart'; import 'package:PiliPlus/utils/grid.dart';
import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage.dart';
import 'package:PiliPlus/utils/utils.dart';
import 'package:easy_debounce/easy_throttle.dart'; import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@@ -42,7 +39,7 @@ class SearchDynamic extends StatelessWidget {
slivers: [ slivers: [
SliverPadding( SliverPadding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
bottom: MediaQuery.paddingOf(context).bottom, bottom: MediaQuery.paddingOf(context).bottom + 80,
), ),
sliver: dynamicsWaterfallFlow sliver: dynamicsWaterfallFlow
? SliverWaterfallFlow.extent( ? SliverWaterfallFlow.extent(
@@ -111,53 +108,4 @@ class SearchDynamic extends StatelessWidget {
LoadingState() => throw UnimplementedError(), LoadingState() => throw UnimplementedError(),
}; };
} }
_buildHeader({
required BuildContext context,
required String face,
required String name,
required dynamic vip,
required dynamic pubTime,
}) {
return Row(
children: [
NetworkImgLayer(
width: 40,
height: 40,
type: 'avatar',
src: face,
),
const SizedBox(width: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
name,
style: TextStyle(
color: vip != null
? (vip?['status'] ?? vip?['vipStatus'] ?? 0) > 0 &&
(vip?['type'] ?? vip?['vipType']) == 2
? context.vipColor
: null
: null,
fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
),
),
],
),
if (pubTime != null)
Text(
Utils.dateFormat(pubTime),
style: TextStyle(
fontSize: 13,
color: Theme.of(context).colorScheme.outline,
),
),
],
),
],
);
}
} }