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

Merge branch 'fix' into alpha

Browse Source
This commit is contained in:
guozhigq
2023-09-17 13:01:12 +08:00
parent c91cfedfe2 1d9372b4f1
commit 262f244a98
9 changed files with 81 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pages/fan/view.dart
View File

@ -16,13 +16,16 @@ class FansPage extends StatefulWidget {
}
class _FansPageState extends State<FansPage> {
final FansController _fansController = Get.put(FansController());
late String mid;
late FansController _fansController;
final ScrollController scrollController = ScrollController();
Future? _futureBuilderFuture;
@override
void initState() {
super.initState();
mid = Get.parameters['mid']!;
_fansController = Get.put(FansController(), tag: mid);
_futureBuilderFuture = _fansController.queryFans('init');
scrollController.addListener(
() async {

5
lib/pages/follow/view.dart
View File

@ -16,13 +16,16 @@ class FollowPage extends StatefulWidget {
}
class _FollowPageState extends State<FollowPage> {
final FollowController _followController = Get.put(FollowController());
late String mid;
late FollowController _followController;
final ScrollController scrollController = ScrollController();
Future? _futureBuilderFuture;
@override
void initState() {
super.initState();
mid = Get.parameters['mid']!;
_followController = Get.put(FollowController(), tag: mid);
_futureBuilderFuture = _followController.queryFollowings('init');
scrollController.addListener(
() async {

1
lib/pages/member/controller.dart
View File

@ -110,6 +110,7 @@ class MemberController extends GetxController {
// 关系查询
Future relationSearch() async {
if (userInfo == null) return;
if (mid == ownerMid) return;
var res = await UserHttp.relationSearch(mid);
if (res['status']) {
attribute.value = res['data']['relation']['attribute'];

43
lib/pages/member/view.dart
View File

@ -20,7 +20,8 @@ class MemberPage extends StatefulWidget {
class _MemberPageState extends State<MemberPage>
with SingleTickerProviderStateMixin {
final MemberController _memberController = Get.put(MemberController());
late String heroTag;
late MemberController _memberController;
Future? _futureBuilderFuture;
final ScrollController _extendNestCtr = ScrollController();
late TabController _tabController;
@ -29,6 +30,8 @@ class _MemberPageState extends State<MemberPage>
@override
void initState() {
super.initState();
heroTag = Get.arguments['heroTag'];
_memberController = Get.put(MemberController(), tag: heroTag);
_tabController = TabController(length: 3, vsync: this, initialIndex: 2);
_futureBuilderFuture = _memberController.getInfo();
_extendNestCtr.addListener(
@ -105,27 +108,33 @@ class _MemberPageState extends State<MemberPage>
PopupMenuButton(
icon: const Icon(Icons.more_vert),
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
if (_memberController.ownerMid !=
_memberController.mid) ...[
PopupMenuItem(
onTap: () => _memberController.blockUser(),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.block, size: 19),
const SizedBox(width: 10),
Text(_memberController.attribute.value != 128
? '加入黑名单'
: '移除黑名单'),
],
),
)
],
PopupMenuItem(
onTap: () => _memberController.blockUser(),
onTap: () => _memberController.shareUser(),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.block, size: 19),
const Icon(Icons.share_outlined, size: 19),
const SizedBox(width: 10),
Text(_memberController.attribute.value != 128
? '加入黑名单'
: '移除黑名单'),
],
),
),
PopupMenuItem(
onTap: () => _memberController.shareUser(),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.share_outlined, size: 19),
SizedBox(width: 10),
Text('分享UP主'),
Text(_memberController.ownerMid !=
_memberController.mid
? '分享UP主'
: '分享我的主页'),
],
),
),

14
lib/pages/member/widgets/profile.dart
View File

@ -123,12 +123,14 @@ Widget profile(ctr, {loadingStatus = false}) {
: '-',
style: const TextStyle(
fontWeight: FontWeight.bold)),
Text('粉丝',
style: TextStyle(
fontSize: Theme.of(context)
.textTheme
.labelMedium!
.fontSize))
Text(
'粉丝',
style: TextStyle(
fontSize: Theme.of(context)
.textTheme
.labelMedium!
.fontSize),
)
],
),
),

38
lib/pages/video/detail/introduction/view.dart
View File

@ -199,6 +199,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
// 视频介绍
showIntroDetail() {
if (loadingStatus) {
return;
}
feedBack();
showBottomSheet(
context: context,
@ -254,22 +257,25 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
),
),
const SizedBox(width: 20),
SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding:
MaterialStateProperty.all(EdgeInsets.zero),
backgroundColor:
MaterialStateProperty.resolveWith((states) {
return t.highlightColor.withOpacity(0.2);
}),
),
onPressed: showIntroDetail,
icon: Icon(
Icons.more_horiz,
color: Theme.of(context).colorScheme.primary,
Opacity(
opacity: loadingStatus ? 0 : 1,
child: SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding:
MaterialStateProperty.all(EdgeInsets.zero),
backgroundColor:
MaterialStateProperty.resolveWith((states) {
return t.highlightColor.withOpacity(0.2);
}),
),
onPressed: showIntroDetail,
icon: Icon(
Icons.more_horiz,
color: Theme.of(context).colorScheme.primary,
),
),
),
),

11
lib/pages/video/detail/replyReply/controller.dart
View File

@ -26,11 +26,6 @@ class VideoReplyReplyController extends GetxController {
currentPage = 0;
}
// 上拉加载
Future onLoad() async {
queryReplyList(type: 'onLoad');
}
Future queryReplyList({type = 'init'}) async {
if (type == 'init') {
currentPage = 0;
@ -49,11 +44,11 @@ class VideoReplyReplyController extends GetxController {
if (replyList.length == res['data'].page.count) {
noMore.value = '没有更多了';
}
currentPage++;
} else {
// 未登录状态replies可能返回null
noMore.value = currentPage == 0 ? '还没有评论' : '没有更多了';
}
currentPage++;
if (type == 'init') {
// List<ReplyItemModel> replies = res['data'].replies;
// 添加置顶回复
@ -72,6 +67,10 @@ class VideoReplyReplyController extends GetxController {
// res['data'].replies = replies;
replyList.value = replies;
} else {
// 每次回复之后，翻页请求有且只有相同的一条回复数据
if (replies.length == 1 && replies.last.rpid == replyList.last.rpid) {
return;
}
replyList.addAll(replies);
// res['data'].replies.addAll(replyList);
}

7
lib/pages/video/detail/replyReply/view.dart
View File

@ -1,3 +1,4 @@
import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
@ -54,9 +55,9 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
() {
if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent - 300) {
if (!_videoReplyReplyController.isLoadingMore) {
_videoReplyReplyController.onLoad();
}
EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
_videoReplyReplyController.queryReplyList(type: 'onLoad');
});
}
},
);

11
lib/pages/video/detail/view.dart
View File

@ -99,10 +99,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
plPlayerController!.triggerFullScreen(status: false);
}
// 播放完展示控制栏
PiPStatus currentStatus = await videoDetailController.floating!.pipStatus;
if (currentStatus == PiPStatus.disabled) {
plPlayerController!.onLockControl(false);
}
try {
PiPStatus currentStatus =
await videoDetailController.floating!.pipStatus;
if (currentStatus == PiPStatus.disabled) {
plPlayerController!.onLockControl(false);
}
} catch (_) {}
}
}