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

mod: 代码整理

Browse Source
This commit is contained in:
guozhigq
2023-07-25 23:44:09 +08:00
parent 6d9f66c420
commit 7745ea076b
74 changed files with 387 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/video/detail/controller.dart
View File

@ -1,6 +1,4 @@
import 'dart:async';
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:flutter_meedu_media_kit/meedu_player.dart';
import 'package:get/get.dart';

13
lib/pages/video/detail/introduction/controller.dart
View File

@ -105,7 +105,6 @@ class VideoIntroController extends GetxController {
// 获取up主粉丝数
Future queryUserStat() async {
var result = await UserHttp.userStat(mid: videoDetail.value.owner!.mid!);
print('🌹：$result');
if (result['status']) {
userStat = result['data'];
}
@ -238,7 +237,6 @@ class VideoIntroController extends GetxController {
onPressed: () async {
var res = await VideoHttp.coinVideo(
bvid: bvid, multiply: _tempThemeValue);
print(res);
if (res['status']) {
SmartDialog.showToast('投币成功');
} else {
@ -263,7 +261,10 @@ class VideoIntroController extends GetxController {
delMediaIdsNew.add(i.id);
}
}
} catch (e) {}
} catch (e) {
// ignore: avoid_print
print(e);
}
var result = await VideoHttp.favVideo(
aid: IdUtils.bv2av(bvid),
addIds: addMediaIdsNew.join(','),
@ -282,10 +283,8 @@ class VideoIntroController extends GetxController {
// 分享视频
Future actionShareVideo() async {
var result =
await Share.share('${HttpString.baseUrl}/video/$bvid').whenComplete(() {
print("share completion block ");
});
var result = await Share.share('${HttpString.baseUrl}/video/$bvid')
.whenComplete(() {});
return result;
}

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

@ -4,8 +4,8 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/common/constants.dart';
import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/pages/fav/index.dart';
import 'package:pilipala/pages/video/detail/index.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/common/widgets/stat/danmu.dart';
@ -53,6 +53,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
@override
Widget build(BuildContext context) {
super.build(context);
return FutureBuilder(
future: videoIntroController.queryVideoIntro(),
builder: (context, snapshot) {
@ -77,10 +78,10 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
}
class VideoInfo extends StatefulWidget {
bool loadingStatus = false;
VideoDetailData? videoDetail;
final bool loadingStatus;
final VideoDetailData? videoDetail;
VideoInfo({Key? key, required this.loadingStatus, this.videoDetail})
const VideoInfo({Key? key, this.loadingStatus = false, this.videoDetail})
: super(key: key);
@override
@ -93,14 +94,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
Get.put(VideoIntroController(), tag: Get.arguments['heroTag']);
bool isExpand = false;
/// 手动控制动画的控制器
late AnimationController? _manualController;
/// 手动控制
late Animation<double>? _manualAnimation;
final FavController _favController = Get.put(FavController());
late VideoDetailController? videoDetailCtr;
Box localCache = GStrorage.localCache;
late double sheetHeight;
@ -109,13 +102,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
void initState() {
super.initState();
/// 不设置重复，使用代码控制进度，动画时间1秒
_manualController = AnimationController(
vsync: this,
duration: const Duration(milliseconds: 400),
);
_manualAnimation =
Tween<double>(begin: 0.5, end: 1.5).animate(_manualController!);
videoDetailCtr =
Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
sheetHeight = localCache.get('sheetHeight');
@ -139,56 +125,70 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
@override
Widget build(BuildContext context) {
return SliverPadding(
padding: const EdgeInsets.only(left: 12, right: 12, top: 15),
padding: const EdgeInsets.only(
left: StyleString.safeSpace, right: StyleString.safeSpace, top: 15),
sliver: SliverToBoxAdapter(
child: !widget.loadingStatus || videoItem.isNotEmpty
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Expanded(
child: Text(
!widget.loadingStatus
? widget.videoDetail!.title
: videoItem['title'],
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(
letterSpacing: 0.5,
fontWeight: FontWeight.w500),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: 20),
SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero),
backgroundColor:
MaterialStateProperty.resolveWith((states) {
return Theme.of(context)
.highlightColor
.withOpacity(0.2);
}),
GestureDetector(
onTap: () {
showBottomSheet(
context: context,
enableDrag: true,
builder: (BuildContext context) {
return IntroDetail(videoDetail: widget.videoDetail!);
},
);
},
child: Row(
children: [
Expanded(
child: Text(
!widget.loadingStatus
? widget.videoDetail!.title
: videoItem['title'],
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(
letterSpacing: 0.5,
fontWeight: FontWeight.w500),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
onPressed: () {
showBottomSheet(
),
const SizedBox(width: 20),
SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding:
MaterialStateProperty.all(EdgeInsets.zero),
backgroundColor:
MaterialStateProperty.resolveWith((states) {
return Theme.of(context)
.highlightColor
.withOpacity(0.2);
}),
),
onPressed: () {
showBottomSheet(
context: context,
enableDrag: true,
builder: (BuildContext context) {
return IntroDetail(
videoDetail: widget.videoDetail!);
});
},
icon: const Icon(Icons.more_horiz),
},
);
},
icon: const Icon(Icons.more_horiz),
),
),
),
],
],
),
),
const SizedBox(height: 6),
Row(
@ -222,7 +222,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
),
// 点赞收藏转发
Padding(
padding: const EdgeInsets.only(top: 20),
padding: const EdgeInsets.only(top: 15),
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: actionRow(
@ -270,25 +270,24 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
fadeOutDuration: Duration.zero,
),
const SizedBox(width: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(!widget.loadingStatus
? widget.videoDetail!.owner!.name
: videoItem['owner'].name),
// const SizedBox(width: 10),
Text(
widget.loadingStatus
? '- 粉丝'
: '${Utils.numFormat(videoIntroController.userStat['follower'])}粉丝',
style: TextStyle(
fontSize: Theme.of(context)
.textTheme
.labelSmall!
.fontSize,
color: Theme.of(context).colorScheme.outline),
),
],
Text(
!widget.loadingStatus
? widget.videoDetail!.owner!.name
: videoItem['owner'].name,
style: const TextStyle(fontSize: 12.5),
),
const SizedBox(width: 10),
Text(
widget.loadingStatus
? '- 粉丝'
: Utils.numFormat(
videoIntroController.userStat['follower']),
style: TextStyle(
fontSize: Theme.of(context)
.textTheme
.labelSmall!
.fontSize,
color: Theme.of(context).colorScheme.outline),
),
const Spacer(),
AnimatedOpacity(
@ -418,14 +417,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
),
const SizedBox(width: 8),
ActionRowItem(
icon: const Icon(FontAwesomeIcons.share),
onTap: () => videoIntroController.actionShareVideo(),
selectStatus: false,
loadingStatus: widget.loadingStatus,
text: !widget.loadingStatus
? widget.videoDetail!.stat!.share!.toString()
: '-',
),
icon: const Icon(FontAwesomeIcons.share),
onTap: () => videoIntroController.actionShareVideo(),
selectStatus: false,
loadingStatus: widget.loadingStatus,
// text: !widget.loadingStatus
// ? widget.videoDetail!.stat!.share!.toString()
// : '-',
text: '转发'),
]);
}

16
lib/pages/video/detail/introduction/widgets/action_item.dart
View File

@ -2,21 +2,21 @@ import 'package:flutter/material.dart';
import 'package:pilipala/common/constants.dart';
class ActionItem extends StatelessWidget {
Icon? icon;
Icon? selectIcon;
Function? onTap;
bool? loadingStatus;
String? text;
bool selectStatus = false;
final Icon? icon;
final Icon? selectIcon;
final Function? onTap;
final bool? loadingStatus;
final String? text;
final bool selectStatus;
ActionItem({
const ActionItem({
Key? key,
this.icon,
this.selectIcon,
this.onTap,
this.loadingStatus,
this.text,
required this.selectStatus,
this.selectStatus = false,
}) : super(key: key);
@override

17
lib/pages/video/detail/introduction/widgets/action_row_item.dart
View File

@ -1,22 +1,21 @@
import 'package:flutter/material.dart';
import 'package:pilipala/common/constants.dart';
class ActionRowItem extends StatelessWidget {
Icon? icon;
Icon? selectIcon;
Function? onTap;
bool? loadingStatus;
String? text;
bool selectStatus = false;
final Icon? icon;
final Icon? selectIcon;
final Function? onTap;
final bool? loadingStatus;
final String? text;
final bool selectStatus;
ActionRowItem({
const ActionRowItem({
Key? key,
this.icon,
this.selectIcon,
this.onTap,
this.loadingStatus,
this.text,
required this.selectStatus,
this.selectStatus = false,
}) : super(key: key);
@override

6
lib/pages/video/detail/introduction/widgets/fav_panel.dart
View File

@ -5,8 +5,8 @@ import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/utils/storage.dart';
class FavPanel extends StatefulWidget {
var ctr;
FavPanel({this.ctr});
final dynamic ctr;
const FavPanel({super.key, this.ctr});
@override
State<FavPanel> createState() => _FavPanelState();
@ -112,7 +112,7 @@ class _FavPanelState extends State<FavPanel> {
}
} else {
// 骨架屏
return Text('请求中');
return const Text('请求中');
}
},
),

8
lib/pages/video/detail/introduction/widgets/intro_detail.dart
View File

@ -11,9 +11,9 @@ Box localCache = GStrorage.localCache;
late double sheetHeight;
class IntroDetail extends StatelessWidget {
var videoDetail;
final dynamic videoDetail;
IntroDetail({
const IntroDetail({
Key? key,
this.videoDetail,
}) : super(key: key);
@ -28,11 +28,11 @@ class IntroDetail extends StatelessWidget {
child: Column(
children: [
Container(
height: 40,
height: 35,
padding: const EdgeInsets.only(bottom: 2),
child: Center(
child: Container(
width: 40,
width: 32,
height: 3,
decoration: BoxDecoration(
color: Theme.of(context)

4
lib/pages/video/detail/introduction/widgets/menu_row.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
class MenuRow extends StatelessWidget {
bool? loadingStatus;
MenuRow({
final bool? loadingStatus;
const MenuRow({
Key? key,
this.loadingStatus,
}) : super(key: key);

1
lib/pages/video/detail/introduction/widgets/season.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:pilipala/models/video_detail_res.dart';
Widget seasonPanel(UgcSeason ugcSeason, cid, sheetHeight) {

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

@ -114,6 +114,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
@override
Widget build(BuildContext context) {
super.build(context);
return RefreshIndicator(
onRefresh: () async {
_videoReplyController.currentPage = 0;

81
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@ -12,21 +12,21 @@ import 'package:pilipala/utils/utils.dart';
import 'zan.dart';
class ReplyItem extends StatelessWidget {
ReplyItem({
super.key,
const ReplyItem({
this.replyItem,
this.addReply,
this.replyLevel,
this.showReplyRow,
this.showReplyRow = true,
this.replyReply,
this.replyType,
});
ReplyItemModel? replyItem;
Function? addReply;
String? replyLevel;
bool? showReplyRow = true;
Function? replyReply;
ReplyType? replyType;
Key? key,
}) : super(key: key);
final ReplyItemModel? replyItem;
final Function? addReply;
final String? replyLevel;
final bool? showReplyRow;
final Function? replyReply;
final ReplyType? replyType;
@override
Widget build(BuildContext context) {
@ -118,7 +118,7 @@ class ReplyItem extends StatelessWidget {
height: 11,
),
const SizedBox(width: 6),
if (replyItem!.isUp!) UpTag(),
if (replyItem!.isUp!) const UpTag(),
],
),
Positioned(
@ -186,7 +186,7 @@ class ReplyItem extends StatelessWidget {
TextSpan(
children: [
if (replyItem!.isTop!)
WidgetSpan(child: UpTag(tagText: 'TOP')),
const WidgetSpan(child: UpTag(tagText: 'TOP')),
buildContent(context, replyItem!, replyReply, null),
],
),
@ -204,7 +204,7 @@ class ReplyItem extends StatelessWidget {
child: ReplyItemRow(
replies: replyItem!.replies,
replyControl: replyItem!.replyControl,
f_rpid: replyItem!.rpid,
// f_rpid: replyItem!.rpid,
replyItem: replyItem,
replyReply: replyReply,
),
@ -216,7 +216,6 @@ class ReplyItem extends StatelessWidget {
// 感谢、回复、复制
Widget bottonAction(context, replyControl) {
var color = Theme.of(context).colorScheme.outline;
return Row(
children: [
const SizedBox(width: 48),
@ -297,13 +296,13 @@ class ReplyItemRow extends StatelessWidget {
super.key,
this.replies,
this.replyControl,
this.f_rpid,
// this.f_rpid,
this.replyItem,
this.replyReply,
});
List? replies;
ReplyControl? replyControl;
int? f_rpid;
// int? f_rpid;
ReplyItemModel? replyItem;
Function? replyReply;
@ -361,7 +360,7 @@ class ReplyItemRow extends StatelessWidget {
},
),
if (replies![i].isUp)
WidgetSpan(
const WidgetSpan(
child: UpTag(),
),
buildContent(
@ -439,16 +438,14 @@ InlineSpan buildContent(
color: Theme.of(context).colorScheme.primary,
),
recognizer: TapGestureRecognizer()
..onTap = () => {
Get.toNamed(
'/webview',
parameters: {
'url': content.vote['url'],
'type': 'vote',
'pageTitle': content.vote['title'],
},
)
},
..onTap = () => Get.toNamed(
'/webview',
parameters: {
'url': content.vote['url'],
'type': 'vote',
'pageTitle': content.vote['title'],
},
),
),
);
return '';
@ -554,11 +551,9 @@ InlineSpan buildContent(
color: Theme.of(context).colorScheme.primary,
),
recognizer: TapGestureRecognizer()
..onTap = () => {
Get.toNamed('/searchResult', parameters: {
'keyword': content.jumpUrl[matchStr]['title']
})
},
..onTap = () => Get.toNamed('/searchResult', parameters: {
'keyword': content.jumpUrl[matchStr]['title']
}),
),
);
spanChilds.add(
@ -718,16 +713,14 @@ InlineSpan buildContent(
color: Theme.of(context).colorScheme.primary,
),
recognizer: TapGestureRecognizer()
..onTap = () => {
Get.toNamed(
'/webview',
parameters: {
'url': content.richText['note']['click_url'],
'type': 'note',
'pageTitle': '笔记预览'
},
)
},
..onTap = () => Get.toNamed(
'/webview',
parameters: {
'url': content.richText['note']['click_url'],
'type': 'note',
'pageTitle': '笔记预览'
},
),
),
);
}
@ -736,8 +729,8 @@ InlineSpan buildContent(
}
class UpTag extends StatelessWidget {
String? tagText;
UpTag({super.key, this.tagText = 'UP'});
final String? tagText;
const UpTag({super.key, this.tagText = 'UP'});
@override
Widget build(BuildContext context) {
Color primary = Theme.of(context).colorScheme.primary;

4
lib/pages/video/detail/reply/widgets/zan.dart
View File

@ -6,13 +6,13 @@ import 'package:pilipala/models/common/reply_type.dart';
import 'package:pilipala/models/video/reply/item.dart';
class ZanButton extends StatefulWidget {
ZanButton({
const ZanButton({
super.key,
this.replyItem,
this.replyType,
});
ReplyItemModel? replyItem;
final ReplyItemModel? replyItem;
final ReplyType? replyType;
@override

25
lib/pages/video/detail/replyNew/view.dart
View File

@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
@ -10,13 +9,14 @@ import 'package:pilipala/models/video/reply/item.dart';
import 'package:pilipala/utils/storage.dart';
class VideoReplyNewDialog extends StatefulWidget {
int? oid;
int? root;
int? parent;
ReplyType? replyType;
ReplyItemModel? replyItem;
final int? oid;
final int? root;
final int? parent;
final ReplyType? replyType;
final ReplyItemModel? replyItem;
VideoReplyNewDialog({
const VideoReplyNewDialog({
super.key,
this.oid,
this.root,
this.parent,
@ -56,7 +56,9 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
_autoFocus() async {
await Future.delayed(const Duration(milliseconds: 300));
FocusScope.of(context).requestFocus(replyContentFocusNode);
if (context.mounted) {
FocusScope.of(context).requestFocus(replyContentFocusNode);
}
}
_printLatestValue() {
@ -91,9 +93,8 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
super.didChangeMetrics();
WidgetsBinding.instance.addPostFrameCallback((_) {
// 键盘高度
final viewInsets = EdgeInsets.fromWindowPadding(
WidgetsBinding.instance.window.viewInsets,
WidgetsBinding.instance.window.devicePixelRatio);
final viewInsets = EdgeInsets.fromViewPadding(
View.of(context).viewInsets, View.of(context).devicePixelRatio);
_debouncer.run(() {
if (mounted) {
setState(() {
@ -197,7 +198,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
}
}
typedef void DebounceCallback();
typedef DebounceCallback = void Function();
class Debouncer {
DebounceCallback? callback;

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

@ -173,8 +173,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
controller: _meeduPlayerController!,
header: (BuildContext context,
MeeduPlayerController
_meeduPlayerController,
Responsive) {
meeduPlayerController,
Responsive responsive) {
return AppBar(
toolbarHeight: 40,
backgroundColor: Colors.transparent,
@ -278,7 +278,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
pinned: true,
delegate: SliverHeaderDelegate(
height: 50,
child: MenuRow(loadingStatus: false),
child:
const MenuRow(loadingStatus: false),
),
),
const RelatedVideoPanel(),
@ -306,6 +307,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
snapshot.data!.toDouble(),
continuePlay,
playerStatus,
null,
);
}),
)

7
lib/pages/video/detail/widgets/app_bar.dart
View File

@ -3,14 +3,15 @@ import 'package:flutter_meedu_media_kit/meedu_player.dart';
class ScrollAppBar extends StatelessWidget {
final double scrollVal;
Function callback;
final Function callback;
final PlayerStatus playerStatus;
ScrollAppBar(
const ScrollAppBar(
this.scrollVal,
this.callback,
this.playerStatus,
);
Key? key,
) : super(key: key);
@override
Widget build(BuildContext context) {

20
lib/pages/video/detail/widgets/expandable_section.dart
View File

@ -1,16 +1,20 @@
// ignore_for_file: library_private_types_in_public_api
import 'package:flutter/material.dart';
class ExpandedSection extends StatefulWidget {
final Widget child;
final Widget? child;
final bool expand;
double begin = 0.0;
double end = 1.0;
final double begin;
final double end;
ExpandedSection(
{this.expand = false,
required this.child,
required this.begin,
required this.end});
const ExpandedSection({
super.key,
this.expand = false,
this.child,
this.begin = 0.0,
this.end = 1.0,
});
@override
_ExpandedSectionState createState() => _ExpandedSectionState();