diff --git a/lib/pages/member/new/widget/user_info_card.dart b/lib/pages/member/new/widget/user_info_card.dart index 86bcbf6b2..30432a6de 100644 --- a/lib/pages/member/new/widget/user_info_card.dart +++ b/lib/pages/member/new/widget/user_info_card.dart @@ -79,11 +79,11 @@ class UserInfoCard extends StatelessWidget { : images.nightImgurl?.http2https) : images.imgUrl?.http2https; return Hero( - tag: imgUrl ?? 'bgTag', + tag: imgUrl ?? '', child: GestureDetector( onTap: () { context.imageView( - imgList: [SourceModel(url: imgUrl ?? 'bgTag')], + imgList: [SourceModel(url: imgUrl ?? '')], ); }, child: CachedNetworkImage( @@ -447,22 +447,22 @@ class UserInfoCard extends StatelessWidget { ), ); - _buildAvatar(BuildContext context) => Container( - decoration: BoxDecoration( - border: Border.all( - width: 2.5, - color: Theme.of(context).colorScheme.surface, - ), - shape: BoxShape.circle, - ), - child: Hero( - tag: card.face ?? 'avatarTag', - child: GestureDetector( - onTap: () { - context.imageView( - imgList: [SourceModel(url: card.face ?? 'avatarTag')], - ); - }, + _buildAvatar(BuildContext context) => Hero( + tag: card.face ?? '', + child: GestureDetector( + onTap: () { + context.imageView( + imgList: [SourceModel(url: card.face ?? '')], + ); + }, + child: Container( + decoration: BoxDecoration( + border: Border.all( + width: 2.5, + color: Theme.of(context).colorScheme.surface, + ), + shape: BoxShape.circle, + ), child: NetworkImgLayer( src: card.face, type: 'avatar', diff --git a/lib/pages/video/detail/controller.dart b/lib/pages/video/detail/controller.dart index cd1ab1045..81937b81b 100644 --- a/lib/pages/video/detail/controller.dart +++ b/lib/pages/video/detail/controller.dart @@ -1962,10 +1962,12 @@ class VideoDetailController extends GetxController viewPointList.clear(); // sponsor block - positionSubscription?.cancel(); - videoLabel.value = ''; - segmentList.clear(); - _segmentProgressList = null; + if (enableSponsorBlock) { + positionSubscription?.cancel(); + videoLabel.value = ''; + segmentList.clear(); + _segmentProgressList = null; + } } late final showDmChart = GStorage.showDmChart; diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart index 9215f788f..f7687404e 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item.dart @@ -551,7 +551,7 @@ class ReplyItem extends StatelessWidget { if (replies![i].isUp!) ...[ const TextSpan(text: ' '), const WidgetSpan( - alignment: PlaceholderAlignment.top, + alignment: PlaceholderAlignment.middle, child: PBadge( text: 'UP', size: 'small', diff --git a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart index bc51504b0..816b6f9b6 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart @@ -585,7 +585,7 @@ class ReplyItemGrpc extends StatelessWidget { if (replyItem.replies[i].mid == upMid) ...[ const TextSpan(text: ' '), const WidgetSpan( - alignment: PlaceholderAlignment.top, + alignment: PlaceholderAlignment.middle, child: PBadge( text: 'UP', size: 'small',