Merge branch 'fix' into alpha

This commit is contained in:
guozhigq
2023-09-17 22:58:25 +08:00

View File

@ -39,6 +39,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
Future? _futureBuilderFuture; Future? _futureBuilderFuture;
bool _isFabVisible = true; bool _isFabVisible = true;
String replyLevel = '1'; String replyLevel = '1';
late String heroTag;
// 添加页面缓存 // 添加页面缓存
@override @override
@ -46,16 +47,17 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
@override @override
void initState() { void initState() {
int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
super.initState(); super.initState();
int oid = widget.bvid != null ? IdUtils.bv2av(widget.bvid!) : 0;
heroTag = Get.arguments['heroTag'];
replyLevel = widget.replyLevel ?? '1'; replyLevel = widget.replyLevel ?? '1';
if (replyLevel == '2') { if (replyLevel == '2') {
_videoReplyController = Get.put( _videoReplyController = Get.put(
VideoReplyController(oid, widget.rpid.toString(), replyLevel), VideoReplyController(oid, widget.rpid.toString(), replyLevel),
tag: widget.rpid.toString()); tag: widget.rpid.toString());
} else { } else {
_videoReplyController = Get.put(VideoReplyController(oid, '', replyLevel), _videoReplyController =
tag: Get.arguments['heroTag']); Get.put(VideoReplyController(oid, '', replyLevel), tag: heroTag);
} }
fabAnimationCtr = AnimationController( fabAnimationCtr = AnimationController(
@ -106,7 +108,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
// 展示二级回复 // 展示二级回复
void replyReply(replyItem) { void replyReply(replyItem) {
VideoDetailController videoDetailCtr = VideoDetailController videoDetailCtr =
Get.find<VideoDetailController>(tag: Get.arguments['heroTag']); Get.find<VideoDetailController>(tag: heroTag);
if (replyItem != null) { if (replyItem != null) {
videoDetailCtr.oid = replyItem.oid; videoDetailCtr.oid = replyItem.oid;
videoDetailCtr.fRpid = replyItem.rpid!; videoDetailCtr.fRpid = replyItem.rpid!;