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

Merge branch 'fix'

Browse Source
This commit is contained in:
guozhigq
2024-11-01 09:23:06 +08:00
parent 7d4e9cb16d 4fd49befbb
commit 1b1e62e146
7 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/http/video.dart
View File

@ -357,8 +357,8 @@ class VideoHttp {
'plat': 1,
'oid': oid,
'type': type.index,
// 'root': root == null || root == 0 ? '' : root,
// 'parent': parent == null || parent == 0 ? '' : parent,
'root': root == null || root == 0 ? '' : root,
'parent': parent == null || parent == 0 ? '' : parent,
'message': message,
'at_name_to_mid': {},
if (pictures != null) 'pictures': jsonEncode(pictures),
@ -377,8 +377,8 @@ class VideoHttp {
},
data: formData,
);
log(res.toString());
if (res.data['code'] == 0) {
log(res.toString());
return {'status': true, 'data': res.data['data']};
} else {
return {'status': false, 'data': [], 'msg': res.data['message']};

21
lib/pages/dynamics/detail/controller.dart
View File

@ -26,6 +26,7 @@ class DynamicDetailController extends GetxController {
RxString sortTypeLabel = ReplySortType.time.labels.obs;
Box setting = GStrorage.setting;
RxInt replyReqCode = 200.obs;
bool isEnd = false;
@override
void onInit() {
@ -48,7 +49,7 @@ class DynamicDetailController extends GetxController {
}
Future queryReplyList({reqType = 'init'}) async {
if (isLoadingMore) {
if (isLoadingMore || noMore.value == '没有更多了' || isEnd) {
return;
}
isLoadingMore = true;
@ -56,10 +57,6 @@ class DynamicDetailController extends GetxController {
nextOffset = '';
noMore.value = '';
}
if (noMore.value == '没有更多了') {
isLoadingMore = false;
return;
}
var res = await ReplyHttp.replyList(
oid: oid!,
nextOffset: nextOffset,
@ -68,15 +65,14 @@ class DynamicDetailController extends GetxController {
);
if (res['status']) {
List<ReplyItemModel> replies = res['data'].replies;
isEnd = res['data'].cursor.isEnd ?? false;
acount.value = res['data'].cursor.allCount;
nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
if (replies.isNotEmpty) {
noMore.value = '加载中...';
if (res['data'].cursor.isEnd == true) {
noMore.value = '没有更多了';
}
noMore.value = isEnd ? '没有更多了' : '加载中...';
} else {
noMore.value = nextOffset == "" ? '还没有评论' : '没有更多了';
noMore.value =
replyList.isEmpty && nextOffset == "" ? '还没有评论' : '没有更多了';
}
if (reqType == 'init') {
// 添加置顶回复
@ -122,4 +118,9 @@ class DynamicDetailController extends GetxController {
var res = await HtmlHttp.reqHtml(id, 'opus');
oid = res['commentId'];
}
// 上拉加载
Future onLoad() async {
queryReplyList(reqType: 'onLoad');
}
}

2
lib/pages/dynamics/detail/view.dart
View File

@ -140,7 +140,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent - 300) {
EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
_dynamicDetailController.queryReplyList(reqType: 'onLoad');
_dynamicDetailController.onLoad();
});
}

28
lib/pages/video/detail/reply/controller.dart
View File

@ -34,6 +34,7 @@ class VideoReplyController extends GetxController {
Box setting = GStrorage.setting;
RxInt replyReqCode = 200.obs;
bool isEnd = false;
@override
void onInit() {
@ -49,8 +50,8 @@ class VideoReplyController extends GetxController {
sortTypeLabel.value = _sortType.labels;
}
Future queryReplyList({type = 'init'}) async {
if (isLoadingMore) {
Future<dynamic> queryReplyList({type = 'init'}) async {
if (isLoadingMore || noMore.value == '没有更多了' || isEnd) {
return;
}
isLoadingMore = true;
@ -58,10 +59,6 @@ class VideoReplyController extends GetxController {
nextOffset = '';
noMore.value = '';
}
if (noMore.value == '没有更多了') {
isLoadingMore = false;
return;
}
final res = await ReplyHttp.replyList(
oid: aid!,
nextOffset: nextOffset,
@ -70,14 +67,13 @@ class VideoReplyController extends GetxController {
);
if (res['status']) {
final List<ReplyItemModel> replies = res['data'].replies;
isEnd = res['data'].cursor.isEnd ?? false;
nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
if (replies.isNotEmpty) {
noMore.value = '加载中...';
if (res['data'].cursor.isEnd == true) {
noMore.value = '没有更多了';
}
noMore.value = isEnd ? '没有更多了' : '加载中...';
} else {
noMore.value = nextOffset == "" ? '还没有评论' : '没有更多了';
noMore.value =
replyList.isEmpty && nextOffset == "" ? '还没有评论' : '没有更多了';
}
if (type == 'init') {
// 添加置顶回复
@ -105,6 +101,14 @@ class VideoReplyController extends GetxController {
queryReplyList(type: 'onLoad');
}
// 下拉刷新
Future onRefresh() async {
nextOffset = "";
noMore.value = '';
isEnd = false;
queryReplyList(type: 'init');
}
// 排序搜索评论
queryBySort() {
EasyThrottle.throttle('queryBySort', const Duration(seconds: 1), () {
@ -118,6 +122,8 @@ class VideoReplyController extends GetxController {
break;
default:
}
isLoadingMore = false;
isEnd = false;
sortTypeTitle.value = _sortType.titles;
sortTypeLabel.value = _sortType.labels;
nextOffset = "";

14
lib/pages/video/detail/reply/view.dart
View File

@ -137,7 +137,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
super.build(context);
return RefreshIndicator(
onRefresh: () async {
return await _videoReplyController.queryReplyList(type: 'init');
return await _videoReplyController.onRefresh();
},
child: Stack(
children: [
@ -312,13 +312,13 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
);
},
).then(
(value) => {
(value) {
// 完成评论，数据添加
if (value != null && value['data'] != null)
{
_videoReplyController.replyList
.add(value['data'])
}
if (value != null && value['data'] != null) {
_videoReplyController.replyList
.add(value['data']);
_videoReplyController.replyList.refresh();
}
},
);
},

15
lib/pages/video/detail/reply_reply/controller.dart
View File

@ -16,7 +16,7 @@ class VideoReplyReplyController extends GetxController {
ReplyItemModel? rootReply;
RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
// 当前页
int currentPage = 0;
int currentPage = 1;
bool isLoadingMore = false;
RxString noMore = ''.obs;
// 当前回复的回复
@ -25,12 +25,12 @@ class VideoReplyReplyController extends GetxController {
@override
void onInit() {
super.onInit();
currentPage = 0;
currentPage = 1;
}
Future queryReplyList({type = 'init', currentReply}) async {
if (type == 'init') {
currentPage = 0;
currentPage = 1;
}
if (isLoadingMore) {
return;
@ -39,7 +39,7 @@ class VideoReplyReplyController extends GetxController {
final res = await ReplyHttp.replyReplyList(
oid: aid!,
root: rpid!,
pageNum: currentPage + 1,
pageNum: currentPage,
type: (replyType ?? ReplyType.video).index,
);
if (res['status']) {
@ -50,12 +50,12 @@ class VideoReplyReplyController extends GetxController {
if (replies.length == res['data'].page.count) {
noMore.value = '没有更多了';
}
currentPage++;
// currentPage++;
} else {
// 未登录状态replies可能返回null
noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
noMore.value = currentPage == 1 ? '还没有评论' : '没有更多了';
}
if (type == 'init') {
if (type == 'init' && currentPage == 1) {
replyList.value = replies;
} else {
// 每次回复之后，翻页请求有且只有相同的一条回复数据
@ -79,6 +79,7 @@ class VideoReplyReplyController extends GetxController {
replyList.insert(0, currentReply);
}
}
currentPage += 1;
isLoadingMore = false;
return res;
}

3
lib/pages/video/detail/reply_reply/view.dart
View File

@ -183,8 +183,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
Expanded(
child: RefreshIndicator(
onRefresh: () async {
setState(() {});
_videoReplyReplyController.currentPage = 0;
_videoReplyReplyController.currentPage = 1;
return await _videoReplyReplyController.queryReplyList(
currentReply: widget.currentReply,
);