mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mod: 历史记录搜索逻辑

Browse Source
This commit is contained in:
guozhigq
2024-05-25 16:16:23 +08:00
parent 7fd5d8240b
commit 95685c4fdf
3 changed files with 59 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/history/widgets/item.dart
View File

@ -244,7 +244,7 @@ class HistoryItem extends StatelessWidget {
), ),
), ),
), ),
videoItem.progress != 0 videoItem.progress != 0 && videoItem.duration != 0
? Positioned( ? Positioned(
left: 3, left: 3,
right: 3, right: 3,

12
lib/pages/history_search/controller.dart
View File

@ -10,9 +10,8 @@ class HistorySearchController extends GetxController {
final FocusNode searchFocusNode = FocusNode(); final FocusNode searchFocusNode = FocusNode();
RxString searchKeyWord = ''.obs; RxString searchKeyWord = ''.obs;
String hintText = '搜索'; String hintText = '搜索';
RxString loadingStatus = 'init'.obs; RxBool loadingStatus = false.obs;
RxString loadingText = '加载中...'.obs; RxString loadingText = '加载中...'.obs;
bool hasRequest = false;
late int mid; late int mid;
RxString uname = ''.obs; RxString uname = ''.obs;
int pn = 1; int pn = 1;
@ -36,8 +35,7 @@ class HistorySearchController extends GetxController {
// 提交搜索内容 // 提交搜索内容
void submit() { void submit() {
loadingStatus.value = 'loading'; if (!loadingStatus.value) {
if (hasRequest) {
pn = 1; pn = 1;
searchHistories(); searchHistories();
} }
@ -48,6 +46,7 @@ class HistorySearchController extends GetxController {
if (type == 'onLoad' && loadingText.value == '没有更多了') { if (type == 'onLoad' && loadingText.value == '没有更多了') {
return; return;
} }
loadingStatus.value = true;
var res = await UserHttp.searchHistory( var res = await UserHttp.searchHistory(
pn: pn, pn: pn,
keyword: controller.value.text, keyword: controller.value.text,
@ -63,9 +62,8 @@ class HistorySearchController extends GetxController {
loadingText.value = '没有更多了'; loadingText.value = '没有更多了';
} }
pn += 1; pn += 1;
hasRequest = true;
} }
loadingStatus.value = 'finish'; loadingStatus.value = false;
return res; return res;
} }
@ -86,6 +84,6 @@ class HistorySearchController extends GetxController {
historyList.removeWhere((e) => e.kid == kid); historyList.removeWhere((e) => e.kid == kid);
SmartDialog.showToast(res['msg']); SmartDialog.showToast(res['msg']);
} }
loadingStatus.value = 'finish'; // loadingStatus.value = fasle;
} }
} }

150
lib/pages/history_search/view.dart
View File

@ -2,7 +2,6 @@ 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';
import 'package:pilipala/common/skeleton/video_card_h.dart'; import 'package:pilipala/common/skeleton/video_card_h.dart';
import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/common/widgets/no_data.dart'; import 'package:pilipala/common/widgets/no_data.dart';
import 'package:pilipala/pages/history/widgets/item.dart'; import 'package:pilipala/pages/history/widgets/item.dart';
@ -16,20 +15,19 @@ class HistorySearchPage extends StatefulWidget {
} }
class _HistorySearchPageState extends State<HistorySearchPage> { class _HistorySearchPageState extends State<HistorySearchPage> {
final HistorySearchController _historySearchCtr = final HistorySearchController _hisCtr = Get.put(HistorySearchController());
Get.put(HistorySearchController());
late ScrollController scrollController; late ScrollController scrollController;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
scrollController = _historySearchCtr.scrollController; scrollController = _hisCtr.scrollController;
scrollController.addListener( scrollController.addListener(
() { () {
if (scrollController.position.pixels >= if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent - 300) { scrollController.position.maxScrollExtent - 300) {
EasyThrottle.throttle('history', const Duration(seconds: 1), () { EasyThrottle.throttle('history', const Duration(seconds: 1), () {
_historySearchCtr.onLoad(); _hisCtr.onLoad();
}); });
} }
}, },
@ -50,19 +48,19 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
titleSpacing: 0, titleSpacing: 0,
actions: [ actions: [
IconButton( IconButton(
onPressed: () => _historySearchCtr.submit(), onPressed: () => _hisCtr.submit(),
icon: const Icon(Icons.search_outlined, size: 22)), icon: const Icon(Icons.search_outlined, size: 22)),
const SizedBox(width: 10) const SizedBox(width: 10)
], ],
title: Obx( title: Obx(
() => TextField( () => TextField(
autofocus: true, autofocus: true,
focusNode: _historySearchCtr.searchFocusNode, focusNode: _hisCtr.searchFocusNode,
controller: _historySearchCtr.controller.value, controller: _hisCtr.controller.value,
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
onChanged: (value) => _historySearchCtr.onChange(value), onChanged: (value) => _hisCtr.onChange(value),
decoration: InputDecoration( decoration: InputDecoration(
hintText: _historySearchCtr.hintText, hintText: _hisCtr.hintText,
border: InputBorder.none, border: InputBorder.none,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: Icon( icon: Icon(
@ -70,103 +68,61 @@ class _HistorySearchPageState extends State<HistorySearchPage> {
size: 22, size: 22,
color: Theme.of(context).colorScheme.outline, color: Theme.of(context).colorScheme.outline,
), ),
onPressed: () => _historySearchCtr.onClear(), onPressed: () => _hisCtr.onClear(),
), ),
), ),
onSubmitted: (String value) => _historySearchCtr.submit(), onSubmitted: (String value) => _hisCtr.submit(),
), ),
), ),
), ),
body: Obx( body: Obx(
() => Column( () {
children: _historySearchCtr.loadingStatus.value == 'init' return _hisCtr.loadingStatus.value && _hisCtr.historyList.isEmpty
? [const SizedBox()] ? ListView.builder(
: [ itemCount: 10,
Expanded( itemBuilder: (context, index) {
child: FutureBuilder( return const VideoCardHSkeleton();
future: _historySearchCtr.searchHistories(), },
builder: (context, snapshot) { )
if (snapshot.connectionState == ConnectionState.done) { : _hisCtr.historyList.isNotEmpty
Map data = snapshot.data as Map; ? ListView.builder(
if (data['status']) { controller: scrollController,
return Obx( itemCount: _hisCtr.historyList.length + 1,
() => _historySearchCtr.historyList.isNotEmpty itemBuilder: (context, index) {
? ListView.builder( if (index == _hisCtr.historyList.length) {
controller: scrollController, return Container(
itemCount: height: MediaQuery.of(context).padding.bottom + 60,
_historySearchCtr.historyList.length + padding: EdgeInsets.only(
1, bottom: MediaQuery.of(context).padding.bottom),
itemBuilder: (context, index) { child: Center(
if (index == child: Obx(
_historySearchCtr () => Text(
.historyList.length) { _hisCtr.loadingText.value,
return Container( style: TextStyle(
height: MediaQuery.of(context) color:
.padding Theme.of(context).colorScheme.outline,
.bottom + fontSize: 13,
60, ),
padding: EdgeInsets.only( ),
bottom: MediaQuery.of(context) ),
.padding ),
.bottom), );
child: Center(
child: Obx(
() => Text(
_historySearchCtr
.loadingText.value,
style: TextStyle(
color: Theme.of(context)
.colorScheme
.outline,
fontSize: 13),
),
),
),
);
} else {
return HistoryItem(
videoItem: _historySearchCtr
.historyList[index],
ctr: _historySearchCtr,
onChoose: null,
onUpdateMultiple: () => null,
);
}
},
)
: _historySearchCtr.loadingStatus.value ==
'loading'
? const SizedBox(child: Text('加载中...'))
: const CustomScrollView(
slivers: <Widget>[
NoData(),
],
),
);
} else {
return CustomScrollView(
slivers: <Widget>[
HttpError(
errMsg: data['msg'],
fn: () => setState(() {}),
)
],
);
}
} else { } else {
// 骨架屏 return HistoryItem(
return ListView.builder( videoItem: _hisCtr.historyList[index],
itemCount: 10, ctr: _hisCtr,
itemBuilder: (context, index) { onChoose: null,
return const VideoCardHSkeleton(); onUpdateMultiple: () => null,
},
); );
} }
}, },
), )
), : const CustomScrollView(
], slivers: <Widget>[
), NoData(),
],
);
},
), ),
); );
} }