refa: query data (#659)

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
dom
2025-04-10 21:43:01 +08:00
committed by GitHub
parent 99b19e7b03
commit e1b73f4766
128 changed files with 1493 additions and 1987 deletions

View File

@@ -1,5 +1,5 @@
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/common/common_controller.dart';
import 'package:PiliPlus/pages/common/common_list_controller.dart';
import 'package:PiliPlus/pages/search_result/controller.dart';
import 'package:PiliPlus/utils/app_scheme.dart';
import 'package:flutter/material.dart';
@@ -7,7 +7,7 @@ import 'package:get/get.dart';
import 'package:PiliPlus/http/search.dart';
import 'package:PiliPlus/models/common/search_type.dart';
class SearchPanelController extends CommonController {
class SearchPanelController extends CommonListController {
SearchPanelController({
required this.keyword,
required this.searchType,
@@ -28,9 +28,14 @@ class SearchPanelController extends CommonController {
int? pubEnd;
bool? hasJump2Video;
SearchResultController? searchResultController;
@override
void onInit() {
super.onInit();
try {
searchResultController = Get.find<SearchResultController>(tag: tag);
} catch (_) {}
if (searchType == SearchType.video) {
jump2Video();
} else if (searchType == SearchType.article) {
@@ -40,31 +45,21 @@ class SearchPanelController extends CommonController {
}
@override
bool customHandleResponse(Success response) {
try {
Get.find<SearchResultController>(tag: tag).count[searchType.index] =
response.response.numResults;
} catch (_) {}
if (response.response.list != null) {
isEnd = response.response.list.isEmpty;
if (currentPage != 1 && loadingState.value is Success) {
response.response.list
.insertAll(0, (loadingState.value as Success).response);
}
loadingState.value = LoadingState.success(response.response.list);
if (searchType == SearchType.video &&
hasJump2Video != true &&
currentPage == 1) {
hasJump2Video = true;
onPushDetail(response.response.list);
}
} else {
isEnd = true;
if (currentPage == 1) {
loadingState.value = LoadingState.success([]);
}
List? getDataList(response) {
return response.list;
}
@override
bool customHandleResponse(bool isRefresh, Success response) {
searchResultController?.count[searchType.index] =
response.response.numResults;
if (searchType == SearchType.video && hasJump2Video != true && isRefresh) {
hasJump2Video = true;
onPushDetail(response.response.list);
}
return true;
return false;
}
void jump2Video() {
@@ -102,10 +97,12 @@ class SearchPanelController extends CommonController {
}
void onPushDetail(resultList) async {
int? aid = int.tryParse(keyword);
if (aid != null && resultList.first.aid == aid) {
PiliScheme.videoPush(aid, null, showDialog: false);
}
try {
int? aid = int.tryParse(keyword);
if (aid != null && resultList.first.aid == aid) {
PiliScheme.videoPush(aid, null, showDialog: false);
}
} catch (_) {}
}
@override

View File

@@ -61,7 +61,7 @@ class _SearchPanelState extends State<SearchPanel>
);
}
Widget _buildBody(LoadingState loadingState) {
Widget _buildBody(LoadingState<List<dynamic>?> loadingState) {
if (loadingState is Loading) {
return CustomScrollView(
physics: const AlwaysScrollableScrollPhysics(),

View File

@@ -16,8 +16,10 @@ import 'package:PiliPlus/utils/utils.dart';
import '../../../utils/grid.dart';
Widget searchArticlePanel(BuildContext context,
SearchPanelController searchPanelCtr, LoadingState loadingState) {
Widget searchArticlePanel(
BuildContext context,
SearchPanelController searchPanelCtr,
LoadingState<List<dynamic>?> loadingState) {
TextStyle textStyle = TextStyle(
fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
color: Theme.of(context).colorScheme.outline);
@@ -80,7 +82,7 @@ Widget searchArticlePanel(BuildContext context,
),
switch (loadingState) {
Loading() => errorWidget(),
Success() => (loadingState.response as List?)?.isNotEmpty == true
Success() => loadingState.response?.isNotEmpty == true
? SliverPadding(
padding: EdgeInsets.only(
bottom: StyleString.safeSpace +
@@ -94,26 +96,26 @@ Widget searchArticlePanel(BuildContext context,
),
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == loadingState.response.length - 1) {
if (index == loadingState.response!.length - 1) {
searchPanelCtr.onLoadMore();
}
final item = loadingState.response![index];
return InkWell(
onTap: () {
Get.toNamed('/htmlRender', parameters: {
'url':
'www.bilibili.com/read/cv${loadingState.response[index].id}',
'title': loadingState.response[index].subTitle,
'id': 'cv${loadingState.response[index].id}',
'url': 'www.bilibili.com/read/cv${item.id}',
'title': item.subTitle,
'id': 'cv${item.id}',
'dynamicType': 'read'
});
},
onLongPress: () => imageSaveDialog(
context: context,
title: (loadingState.response[index].title as List?)
title: (item.title as List?)
?.map((item) => item['text'])
.join() ??
'',
cover: loadingState.response[index].imageUrls.first,
cover: item.imageUrls.first,
),
child: Padding(
padding: const EdgeInsets.symmetric(
@@ -135,11 +137,8 @@ Widget searchArticlePanel(BuildContext context,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
if (loadingState
.response[index].imageUrls !=
null &&
loadingState.response[index].imageUrls
.isNotEmpty)
if (item.imageUrls != null &&
item.imageUrls.isNotEmpty)
AspectRatio(
aspectRatio: StyleString.aspectRatio,
child: LayoutBuilder(
@@ -151,8 +150,7 @@ Widget searchArticlePanel(BuildContext context,
return NetworkImgLayer(
width: maxWidth,
height: maxHeight,
src: loadingState.response[index]
.imageUrls.first,
src: item.imageUrls.first,
);
}),
),
@@ -167,8 +165,7 @@ Widget searchArticlePanel(BuildContext context,
maxLines: 2,
TextSpan(
children: [
for (var i in loadingState
.response[index].title) ...[
for (var i in item.title) ...[
TextSpan(
text: i['text'],
style: TextStyle(
@@ -187,19 +184,15 @@ Widget searchArticlePanel(BuildContext context,
),
const Spacer(),
Text(
Utils.dateFormat(
loadingState
.response[index].pubTime,
Utils.dateFormat(item.pubTime,
formatType: 'detail'),
style: textStyle),
Row(
children: [
Text(
'${loadingState.response[index].view}浏览',
Text('${item.view}浏览',
style: textStyle),
Text('', style: textStyle),
Text(
'${loadingState.response[index].reply}评论',
Text('${item.reply}评论',
style: textStyle),
],
),
@@ -214,7 +207,7 @@ Widget searchArticlePanel(BuildContext context,
),
);
},
childCount: loadingState.response.length,
childCount: loadingState.response!.length,
),
),
)

View File

@@ -8,10 +8,11 @@ import 'package:PiliPlus/common/widgets/network_img_layer.dart';
import '../../../utils/grid.dart';
Widget searchLivePanel(BuildContext context, ctr, LoadingState loadingState) {
Widget searchLivePanel(
BuildContext context, ctr, LoadingState<List<dynamic>?> loadingState) {
return switch (loadingState) {
Loading() => loadingWidget,
Success() => (loadingState.response as List?)?.isNotEmpty == true
Success() => loadingState.response?.isNotEmpty == true
? GridView.builder(
padding: EdgeInsets.only(
left: StyleString.safeSpace,
@@ -27,12 +28,12 @@ Widget searchLivePanel(BuildContext context, ctr, LoadingState loadingState) {
childAspectRatio: StyleString.aspectRatio,
mainAxisExtent: MediaQuery.textScalerOf(context).scale(80),
),
itemCount: loadingState.response.length,
itemCount: loadingState.response!.length,
itemBuilder: (context, index) {
if (index == loadingState.response.length - 1) {
if (index == loadingState.response!.length - 1) {
ctr.onLoadMore();
}
return LiveItem(liveItem: loadingState.response[index]);
return LiveItem(liveItem: loadingState.response![index]);
},
)
: errorWidget(

View File

@@ -9,11 +9,12 @@ import 'package:PiliPlus/utils/utils.dart';
import '../../../utils/grid.dart';
Widget searchBangumiPanel(context, ctr, LoadingState loadingState) {
Widget searchBangumiPanel(
context, ctr, LoadingState<List<dynamic>?> loadingState) {
late TextStyle style = TextStyle(fontSize: 13);
return switch (loadingState) {
Loading() => loadingWidget,
Success() => (loadingState.response as List?)?.isNotEmpty == true
Success() => loadingState.response?.isNotEmpty == true
? CustomScrollView(
controller: ctr.scrollController,
slivers: [
@@ -28,10 +29,10 @@ Widget searchBangumiPanel(context, ctr, LoadingState loadingState) {
),
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == loadingState.response.length - 1) {
if (index == loadingState.response!.length - 1) {
ctr.onLoadMore();
}
var i = loadingState.response[index];
var i = loadingState.response![index];
return InkWell(
onTap: () {
Utils.viewBangumi(seasonId: i.seasonId);
@@ -139,7 +140,7 @@ Widget searchBangumiPanel(context, ctr, LoadingState loadingState) {
),
);
},
childCount: loadingState.response.length,
childCount: loadingState.response!.length,
),
),
),

View File

@@ -14,8 +14,10 @@ import 'package:PiliPlus/utils/utils.dart';
import '../../../utils/grid.dart';
Widget searchUserPanel(BuildContext context,
SearchPanelController searchPanelCtr, LoadingState loadingState) {
Widget searchUserPanel(
BuildContext context,
SearchPanelController searchPanelCtr,
LoadingState<List<dynamic>?> loadingState) {
TextStyle style = TextStyle(
fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
color: Theme.of(context).colorScheme.outline);
@@ -78,7 +80,7 @@ Widget searchUserPanel(BuildContext context,
),
switch (loadingState) {
Loading() => errorWidget(),
Success() => (loadingState.response as List?)?.isNotEmpty == true
Success() => loadingState.response?.isNotEmpty == true
? SliverPadding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).padding.bottom + 80,
@@ -90,10 +92,10 @@ Widget searchUserPanel(BuildContext context,
),
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == loadingState.response.length - 1) {
if (index == loadingState.response!.length - 1) {
searchPanelCtr.onLoadMore();
}
var i = loadingState.response[index];
var i = loadingState.response![index];
String heroTag = Utils.makeHeroTag(i!.mid);
return InkWell(
onTap: () => Get.toNamed('/member?mid=${i.mid}',
@@ -170,7 +172,7 @@ Widget searchUserPanel(BuildContext context,
),
);
},
childCount: loadingState.response.length,
childCount: loadingState.response!.length,
),
),
)

View File

@@ -16,8 +16,10 @@ import 'package:intl/intl.dart';
import '../../../common/constants.dart';
import '../../../utils/grid.dart';
Widget searchVideoPanel(BuildContext context,
SearchPanelController searchPanelCtr, LoadingState loadingState) {
Widget searchVideoPanel(
BuildContext context,
SearchPanelController searchPanelCtr,
LoadingState<List<dynamic>?> loadingState) {
final controller = Get.put(VideoPanelController(), tag: searchPanelCtr.tag);
return CustomScrollView(
controller: searchPanelCtr.scrollController,
@@ -90,7 +92,7 @@ Widget searchVideoPanel(BuildContext context,
),
switch (loadingState) {
Loading() => errorWidget(),
Success() => (loadingState.response as List?)?.isNotEmpty == true
Success() => loadingState.response?.isNotEmpty == true
? SliverPadding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).padding.bottom + 80,
@@ -103,15 +105,15 @@ Widget searchVideoPanel(BuildContext context,
),
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
if (index == loadingState.response.length - 1) {
if (index == loadingState.response!.length - 1) {
searchPanelCtr.onLoadMore();
}
return VideoCardH(
videoItem: loadingState.response[index],
videoItem: loadingState.response![index],
showPubdate: true,
);
},
childCount: loadingState.response.length,
childCount: loadingState.response!.length,
),
),
)