提交 419f9a10 authored 作者: yueweilu's avatar yueweilu

1、笔记和讨论添加分页记载

2、搜索历史添加分页加载
上级 8555a6c0
...@@ -156,7 +156,7 @@ abstract class LibraryAPI { ...@@ -156,7 +156,7 @@ abstract class LibraryAPI {
'book_id': bookId, 'book_id': bookId,
'chapter_id': chapterId 'chapter_id': chapterId
}, },
showLoading: true // showLoading: true
); );
if (result.data is! Map && result.data['list'] is! List) return []; if (result.data is! Map && result.data['list'] is! List) return [];
return List.generate(result.data['list'].length, (index) { return List.generate(result.data['list'].length, (index) {
...@@ -179,7 +179,7 @@ abstract class LibraryAPI { ...@@ -179,7 +179,7 @@ abstract class LibraryAPI {
'book_id': bookId, 'book_id': bookId,
'chapter_id': chapterId 'chapter_id': chapterId
}, },
showLoading: true, // showLoading: true,
); );
if (result.data is! Map && result.data['list'] is! List) return []; if (result.data is! Map && result.data['list'] is! List) return [];
return List.generate(result.data['list'].length, (index) { return List.generate(result.data['list'].length, (index) {
......
...@@ -51,3 +51,4 @@ part 'discuss_controller.dart'; ...@@ -51,3 +51,4 @@ part 'discuss_controller.dart';
part 'widgets/input_discuss.dart'; part 'widgets/input_discuss.dart';
part 'widgets/item.dart'; part 'widgets/item.dart';
part 'widgets/search_all.dart'; part 'widgets/search_all.dart';
part 'search_all_controller.dart';
...@@ -87,6 +87,10 @@ class _ReadCategoryPageState extends State<ReadCategoryPage> { ...@@ -87,6 +87,10 @@ class _ReadCategoryPageState extends State<ReadCategoryPage> {
], ],
), ),
widget.controller.showSearch? Expanded( widget.controller.showSearch? Expanded(
child: CustomPullScrollView(
controller: widget.controller.refreshController,
onRefresh: widget.controller.onRefreshSearch,
onLoading: widget.controller.onLoadingSearch,
child: BuildSearchAll( child: BuildSearchAll(
onTap: (SearchAllModel sModel){ onTap: (SearchAllModel sModel){
if (widget.onTapSearchItem !=null) { if (widget.onTapSearchItem !=null) {
...@@ -94,7 +98,8 @@ class _ReadCategoryPageState extends State<ReadCategoryPage> { ...@@ -94,7 +98,8 @@ class _ReadCategoryPageState extends State<ReadCategoryPage> {
} }
}, },
searchALlResults: widget.controller.searchALlResults searchALlResults: widget.controller.searchALlResults
,)): ,),
)):
widget.controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.controller.bookDetailModel,), widget.controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.controller.bookDetailModel,),
widget.controller.showSearch?const SizedBox():Expanded( widget.controller.showSearch?const SizedBox():Expanded(
child: ListView.builder( child: ListView.builder(
......
...@@ -88,6 +88,10 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> { ...@@ -88,6 +88,10 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> {
], ],
), ),
controller.showSearch? Expanded( controller.showSearch? Expanded(
child: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefreshSearch,
onLoading: controller.onLoadingSearch,
child: BuildSearchAll( child: BuildSearchAll(
onTap: (SearchAllModel sModel){ onTap: (SearchAllModel sModel){
if (widget.onTapSearchItem !=null) { if (widget.onTapSearchItem !=null) {
...@@ -95,12 +99,17 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> { ...@@ -95,12 +99,17 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> {
} }
}, },
searchALlResults: controller.searchALlResults, searchALlResults: controller.searchALlResults,
),
)): )):
controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.bookDetailModel,), controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.bookDetailModel,),
controller.showSearch?const SizedBox():Expanded( controller.showSearch?const SizedBox():Expanded(
child: Stack( child: Stack(
children: [ children: [
ListView.builder( CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: ListView.builder(
itemBuilder: (BuildContext context,int index){ itemBuilder: (BuildContext context,int index){
DiscussModel model = controller.discuss[index]; DiscussModel model = controller.discuss[index];
return BuildDiscuss( return BuildDiscuss(
...@@ -114,6 +123,7 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> { ...@@ -114,6 +123,7 @@ class _ReadDiscussPageState extends State<ReadDiscussPage> {
}, },
itemCount: controller.discuss.length, itemCount: controller.discuss.length,
), ),
),
Visibility( Visibility(
visible: controller.showReply, visible: controller.showReply,
child: Positioned( child: Positioned(
......
...@@ -85,20 +85,30 @@ class _ReadNotePageState extends State<ReadNotePage> { ...@@ -85,20 +85,30 @@ class _ReadNotePageState extends State<ReadNotePage> {
):const SizedBox(), ):const SizedBox(),
], ],
), ),
controller.showSearch? Expanded(child: BuildSearchAll( controller.showSearch? Expanded(
child: CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefreshSearch,
onLoading: controller.onLoadingSearch,
child: BuildSearchAll(
onTap: (SearchAllModel sModel){ onTap: (SearchAllModel sModel){
if (widget.onTapSearchItem !=null) { if (widget.onTapSearchItem !=null) {
widget.onTapSearchItem!(sModel); widget.onTapSearchItem!(sModel);
} }
}, },
searchALlResults: controller.searchALlResults searchALlResults: controller.searchALlResults
),
)): )):
controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.bookDetailModel,), controller.showSearch?const SizedBox():BuildBook(bookDetailModel: widget.bookDetailModel,),
controller.showSearch?const SizedBox():Expanded( controller.showSearch?const SizedBox():Expanded(
child: MediaQuery.removePadding( child: MediaQuery.removePadding(
context: context, context: context,
removeTop: true, removeTop: true,
child:ListView.builder( child:CustomPullScrollView(
controller: controller.refreshController,
onRefresh: controller.onRefresh,
onLoading: controller.onLoading,
child: ListView.builder(
itemBuilder: (BuildContext context,int index){ itemBuilder: (BuildContext context,int index){
NoteModel model = controller.notes[index]; NoteModel model = controller.notes[index];
// 划线 // 划线
...@@ -139,6 +149,7 @@ class _ReadNotePageState extends State<ReadNotePage> { ...@@ -139,6 +149,7 @@ class _ReadNotePageState extends State<ReadNotePage> {
), ),
), ),
), ),
),
], ],
), ),
); );
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论