Compare commits

..

8 Commits

Author SHA1 Message Date
a9d73a9f1b fix: 动态标题未显示 2024-02-28 23:51:30 +08:00
0b5397ec00 fix: 动态评论区seek error 2024-02-28 23:29:02 +08:00
466214b26a fix: statusBarIcon color 2024-02-28 23:17:03 +08:00
835ea0a9ff Merge branch 'design' 2024-02-26 00:03:00 +08:00
89501d3daa Merge branch 'main' of github.com:guozhigq/pilipala 2024-02-26 00:02:06 +08:00
90c0256766 opt: 图片加载&设置 2024-02-26 00:00:14 +08:00
c2767486f5 Merge branch 'main' into design 2024-02-25 23:24:33 +08:00
e2befb11ff feat: 横屏全屏时展示视频标题 2024-02-24 02:37:16 +08:00
12 changed files with 134 additions and 39 deletions

View File

@ -2,6 +2,7 @@ import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:pilipala/utils/extension.dart'; import 'package:pilipala/utils/extension.dart';
import 'package:pilipala/utils/global_data.dart';
import '../../utils/storage.dart'; import '../../utils/storage.dart';
import '../constants.dart'; import '../constants.dart';
@ -32,8 +33,10 @@ class NetworkImgLayer extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final int defaultImgQuality = GlobalData().imgQuality;
final String imageUrl = final String imageUrl =
'${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp'; '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
print(imageUrl);
int? memCacheWidth, memCacheHeight; int? memCacheWidth, memCacheHeight;
double aspectRatio = (width / height).toDouble(); double aspectRatio = (width / height).toDouble();
@ -81,7 +84,7 @@ class NetworkImgLayer extends StatelessWidget {
fadeOutDuration ?? const Duration(milliseconds: 120), fadeOutDuration ?? const Duration(milliseconds: 120),
fadeInDuration: fadeInDuration:
fadeInDuration ?? const Duration(milliseconds: 120), fadeInDuration ?? const Duration(milliseconds: 120),
filterQuality: FilterQuality.high, filterQuality: FilterQuality.low,
errorWidget: (BuildContext context, String url, Object error) => errorWidget: (BuildContext context, String url, Object error) =>
placeholder(context), placeholder(context),
placeholder: (BuildContext context, String url) => placeholder: (BuildContext context, String url) =>

View File

@ -201,11 +201,11 @@ class _AboutPageState extends State<AboutPage> {
var cleanStatus = await CacheManage().clearCacheAll(); var cleanStatus = await CacheManage().clearCacheAll();
if (cleanStatus) { if (cleanStatus) {
getCacheSize(); getCacheSize();
SmartDialog.showToast('清除成功');
} }
}, },
title: const Text('清除缓存'), title: const Text('清除缓存'),
subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle), subtitle: Text('图片及网络缓存 $cacheSize', style: subTitleStyle),
trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
), ),
SizedBox(height: MediaQuery.of(context).padding.bottom + 20) SizedBox(height: MediaQuery.of(context).padding.bottom + 20)
], ],

View File

@ -45,7 +45,9 @@ class _ContentState extends State<Content> {
if (len == 1) { if (len == 1) {
OpusPicsModel pictureItem = pics.first; OpusPicsModel pictureItem = pics.first;
picList.add(pictureItem.url!); picList.add(pictureItem.url!);
spanChilds.add(const TextSpan(text: '\n'));
/// 图片上方的空白间隔
// spanChilds.add(const TextSpan(text: '\n'));
spanChilds.add( spanChilds.add(
WidgetSpan( WidgetSpan(
child: LayoutBuilder( child: LayoutBuilder(

View File

@ -19,6 +19,17 @@ InlineSpan richNode(item, context) {
// 动态页面 richTextNodes 层级可能与主页动态层级不同 // 动态页面 richTextNodes 层级可能与主页动态层级不同
richTextNodes = richTextNodes =
item.modules.moduleDynamic.major.opus.summary.richTextNodes; item.modules.moduleDynamic.major.opus.summary.richTextNodes;
if (item.modules.moduleDynamic.major.opus.title != null) {
spanChilds.add(
TextSpan(
text: item.modules.moduleDynamic.major.opus.title + '\n',
style: Theme.of(context)
.textTheme
.titleMedium!
.copyWith(fontWeight: FontWeight.bold),
),
);
}
} }
if (richTextNodes == null || richTextNodes.isEmpty) { if (richTextNodes == null || richTextNodes.isEmpty) {
return spacer; return spacer;

View File

@ -58,6 +58,9 @@ class _HomePageState extends State<HomePage>
return Scaffold( return Scaffold(
extendBody: true, extendBody: true,
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
appBar: _homeController.enableGradientBg
? null
: AppBar(toolbarHeight: 0, elevation: 0),
body: Stack( body: Stack(
children: [ children: [
// gradient background // gradient background

View File

@ -1,11 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:pilipala/models/common/dynamics_type.dart'; import 'package:pilipala/models/common/dynamics_type.dart';
import 'package:pilipala/models/common/reply_sort_type.dart'; import 'package:pilipala/models/common/reply_sort_type.dart';
import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/storage.dart';
import '../home/index.dart';
import 'widgets/switch_item.dart'; import 'widgets/switch_item.dart';
class ExtraSetting extends StatefulWidget { class ExtraSetting extends StatefulWidget {
@ -138,18 +140,20 @@ class _ExtraSettingState extends State<ExtraSetting> {
), ),
body: ListView( body: ListView(
children: [ children: [
SetSwitchItem( const SetSwitchItem(
title: '大家都在搜', title: '大家都在搜',
subTitle: '是否展示「大家都在搜」', subTitle: '是否展示「大家都在搜」',
setKey: SettingBoxKey.enableHotKey, setKey: SettingBoxKey.enableHotKey,
defaultVal: true, defaultVal: true,
callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
), ),
const SetSwitchItem( SetSwitchItem(
title: '搜索默认词', title: '搜索默认词',
subTitle: '是否展示搜索框默认词', subTitle: '是否展示搜索框默认词',
setKey: SettingBoxKey.enableSearchWord, setKey: SettingBoxKey.enableSearchWord,
defaultVal: true, defaultVal: true,
callFn: (val) {
Get.find<HomeController>().defaultSearch.value = '';
},
), ),
const SetSwitchItem( const SetSwitchItem(
title: '快速收藏', title: '快速收藏',

View File

@ -8,6 +8,7 @@ import 'package:pilipala/models/common/theme_type.dart';
import 'package:pilipala/pages/setting/pages/color_select.dart'; import 'package:pilipala/pages/setting/pages/color_select.dart';
import 'package:pilipala/pages/setting/widgets/select_dialog.dart'; import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
import 'package:pilipala/pages/setting/widgets/slide_dialog.dart'; import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
import 'package:pilipala/utils/global_data.dart';
import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/storage.dart';
import '../../models/common/dynamic_badge_mode.dart'; import '../../models/common/dynamic_badge_mode.dart';
@ -176,6 +177,8 @@ class _StyleSettingState extends State<StyleSetting> {
SettingBoxKey.defaultPicQa, picQuality); SettingBoxKey.defaultPicQa, picQuality);
Get.back(); Get.back();
settingController.picQuality.value = picQuality; settingController.picQuality.value = picQuality;
GlobalData().imgQuality = picQuality;
SmartDialog.showToast('设置成功');
}, },
child: const Text('确定'), child: const Text('确定'),
) )

View File

@ -2,7 +2,6 @@ import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/pages/fav/widgets/item.dart';
import 'controller.dart'; import 'controller.dart';
import 'widgets/item.dart'; import 'widgets/item.dart';

View File

@ -462,6 +462,9 @@ class ReplyItemRow extends StatelessWidget {
InlineSpan buildContent( InlineSpan buildContent(
BuildContext context, replyItem, replyReply, fReplyItem) { BuildContext context, replyItem, replyReply, fReplyItem) {
final String routePath = Get.currentRoute;
bool isVideoPage = routePath.startsWith('/video/detail');
// replyItem 当前回复内容 // replyItem 当前回复内容
// replyReply 查看二楼回复(回复详情)回调 // replyReply 查看二楼回复(回复详情)回调
// fReplyItem 父级回复内容,用作二楼回复(回复详情)展示 // fReplyItem 父级回复内容,用作二楼回复(回复详情)展示
@ -571,21 +574,26 @@ InlineSpan buildContent(
spanChilds.add( spanChilds.add(
TextSpan( TextSpan(
text: ' $matchStr ', text: ' $matchStr ',
style: TextStyle( style: isVideoPage
color: Theme.of(context).colorScheme.primary, ? TextStyle(
), color: Theme.of(context).colorScheme.primary,
)
: null,
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () { ..onTap = () {
// 跳转到指定位置 // 跳转到指定位置
try { if (isVideoPage) {
SmartDialog.showToast('跳转至:$matchStr'); try {
Get.find<VideoDetailController>(tag: Get.arguments['heroTag']) SmartDialog.showToast('跳转至:$matchStr');
.plPlayerController Get.find<VideoDetailController>(
.seekTo( tag: Get.arguments['heroTag'])
Duration(seconds: Utils.duration(matchStr)), .plPlayerController
); .seekTo(
} catch (e) { Duration(seconds: Utils.duration(matchStr)),
SmartDialog.showToast('跳转失败: $e'); );
} catch (e) {
SmartDialog.showToast('跳转失败: $e');
}
} }
}, },
), ),

View File

@ -19,6 +19,8 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/storage.dart';
import 'package:pilipala/http/danmaku.dart'; import 'package:pilipala/http/danmaku.dart';
import 'package:pilipala/services/shutdown_timer_service.dart'; import 'package:pilipala/services/shutdown_timer_service.dart';
import '../../../../models/video_detail_res.dart';
import '../introduction/index.dart';
class HeaderControl extends StatefulWidget implements PreferredSizeWidget { class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
const HeaderControl({ const HeaderControl({
@ -48,11 +50,31 @@ class _HeaderControlState extends State<HeaderControl> {
final Box<dynamic> videoStorage = GStrorage.video; final Box<dynamic> videoStorage = GStrorage.video;
late List<double> speedsList; late List<double> speedsList;
double buttonSpace = 8; double buttonSpace = 8;
bool showTitle = false;
late String heroTag;
late VideoIntroController videoIntroController;
late VideoDetailData videoDetail;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
videoInfo = widget.videoDetailCtr!.data; videoInfo = widget.videoDetailCtr!.data;
speedsList = widget.controller!.speedsList; speedsList = widget.controller!.speedsList;
fullScreenStatusListener();
heroTag = Get.arguments['heroTag'];
videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
}
void fullScreenStatusListener() {
widget.videoDetailCtr!.plPlayerController.isFullScreen
.listen((bool isFullScreen) {
if (isFullScreen) {
showTitle = true;
} else {
showTitle = false;
}
setState(() {});
});
} }
/// 设置面板 /// 设置面板
@ -342,8 +364,7 @@ class _HeaderControlState extends State<HeaderControl> {
}, },
dense: true, dense: true,
contentPadding: const EdgeInsets.only(), contentPadding: const EdgeInsets.only(),
title: title: const Text("额外等待视频播放完毕", style: titleStyle),
const Text("额外等待视频播放完毕", style: titleStyle),
trailing: Switch( trailing: Switch(
// thumb color (round icon) // thumb color (round icon)
activeColor: Theme.of(context).colorScheme.primary, activeColor: Theme.of(context).colorScheme.primary,
@ -891,7 +912,7 @@ class _HeaderControlState extends State<HeaderControl> {
final DanmakuOption currentOption = final DanmakuOption currentOption =
danmakuController.option; danmakuController.option;
final DanmakuOption updatedOption = final DanmakuOption updatedOption =
currentOption.copyWith(strokeWidth: val); currentOption.copyWith(strokeWidth: val);
danmakuController.updateOption(updatedOption); danmakuController.updateOption(updatedOption);
} catch (_) {} } catch (_) {}
}, },
@ -1047,6 +1068,8 @@ class _HeaderControlState extends State<HeaderControl> {
color: Colors.white, color: Colors.white,
fontSize: 12, fontSize: 12,
); );
final bool isLandscape =
MediaQuery.of(context).orientation == Orientation.landscape;
return AppBar( return AppBar(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
foregroundColor: Colors.white, foregroundColor: Colors.white,
@ -1081,21 +1104,47 @@ class _HeaderControlState extends State<HeaderControl> {
}, },
), ),
SizedBox(width: buttonSpace), SizedBox(width: buttonSpace),
ComBtn( if (showTitle && isLandscape) ...[
icon: const Icon( Column(
FontAwesomeIcons.house, crossAxisAlignment: CrossAxisAlignment.start,
size: 15, children: [
color: Colors.white, ConstrainedBox(
constraints: BoxConstraints(maxWidth: 200),
child: Text(
videoIntroController.videoDetail.value.title!,
style: const TextStyle(
color: Colors.white,
fontSize: 16,
),
),
),
if (videoIntroController.isShowOnlineTotal)
Text(
'${videoIntroController.total.value}人正在看',
style: const TextStyle(
color: Colors.white,
fontSize: 12,
),
)
],
)
] else ...[
ComBtn(
icon: const Icon(
FontAwesomeIcons.house,
size: 15,
color: Colors.white,
),
fuc: () async {
// 销毁播放器实例
await widget.controller!.dispose(type: 'all');
if (mounted) {
Navigator.popUntil(
context, (Route<dynamic> route) => route.isFirst);
}
},
), ),
fuc: () async { ],
// 销毁播放器实例
await widget.controller!.dispose(type: 'all');
if (mounted) {
Navigator.popUntil(
context, (Route<dynamic> route) => route.isFirst);
}
},
),
const Spacer(), const Spacer(),
// ComBtn( // ComBtn(
// icon: const Icon( // icon: const Icon(

View File

@ -0,0 +1,12 @@
class GlobalData {
int imgQuality = 10;
// 私有构造函数
GlobalData._();
// 单例实例
static final GlobalData _instance = GlobalData._();
// 获取全局实例
factory GlobalData() => _instance;
}

View File

@ -1,11 +1,10 @@
// import 'package:hive/hive.dart';
import 'dart:io'; import 'dart:io';
import 'package:hive_flutter/hive_flutter.dart'; import 'package:hive_flutter/hive_flutter.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:pilipala/models/model_owner.dart'; import 'package:pilipala/models/model_owner.dart';
import 'package:pilipala/models/search/hot.dart'; import 'package:pilipala/models/search/hot.dart';
import 'package:pilipala/models/user/info.dart'; import 'package:pilipala/models/user/info.dart';
import 'global_data.dart';
class GStrorage { class GStrorage {
static late final Box<dynamic> userInfo; static late final Box<dynamic> userInfo;
@ -44,6 +43,8 @@ class GStrorage {
); );
// 视频设置 // 视频设置
video = await Hive.openBox('video'); video = await Hive.openBox('video');
GlobalData().imgQuality =
setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10); // 设置全局变量
} }
static void regAdapter() { static void regAdapter() {