HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: dynamicDetail/html page

Browse Source 
Closes #60

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2024-12-28 12:32:04 +08:00
parent de91bdff74
commit ec8c010c96
15 changed files with 304 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common/widgets/html_render.dart
View File

@@ -69,7 +69,7 @@ Widget htmlRender({
],
style: {
'html': Style(
fontSize: FontSize(17),
fontSize: FontSize(16),
lineHeight: LineHeight.percent(160),
letterSpacing: 0.3,
),
@@ -105,7 +105,7 @@ Widget htmlRender({
margin: Margins.only(bottom: 8),
),
'h3,h4,h5': Style(
fontSize: FontSize(17),
fontSize: FontSize(16),
fontWeight: FontWeight.bold,
margin: Margins.only(bottom: 4),
),

3
lib/pages/about/index.dart
View File

@@ -310,8 +310,7 @@ class _AboutPageState extends State<AboutPage> {
onTap: () async {
Get.back();
String data = await GStorage.exportAllSettings();
Clipboard.setData(ClipboardData(text: data));
SmartDialog.showToast('已复制到剪贴板');
Utils.copyText(data);
},
),
ListTile(

4
lib/pages/bangumi/introduction/controller.dart
View File

@@ -7,7 +7,6 @@ import 'package:PiliPalaX/pages/common/common_controller.dart';
import 'package:PiliPalaX/pages/video/detail/introduction/controller.dart';
import 'package:PiliPalaX/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:get/get_navigation/src/dialog/dialog_route.dart';
@@ -325,8 +324,7 @@ class BangumiIntroController extends CommonController {
),
onTap: () {
Get.back();
Clipboard.setData(ClipboardData(text: videoUrl));
SmartDialog.showToast('已复制');
Utils.copyText(videoUrl);
},
),
ListTile(

56
lib/pages/dynamics/detail/view.dart
View File

@@ -115,12 +115,11 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
}
// 查看二级评论
void replyReply(replyItem, id, isTop) {
void replyReply(context, replyItem, id, isTop) {
EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () {
int oid = replyItem.oid.toInt();
int rpid = GlobalData().grpcReply ? replyItem.id.toInt() : replyItem.rpid;
Get.to(
() => Scaffold(
Widget replyReplyPage() => Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(title: Text('评论详情')),
body: VideoReplyReplyPanel(
@@ -132,8 +131,23 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
firstFloor: replyItem,
isTop: isTop ?? false,
),
);
if (this.context.orientation == Orientation.portrait) {
Get.to(replyReplyPage);
} else {
ScaffoldState? scaffoldState = Scaffold.maybeOf(context);
if (scaffoldState != null) {
scaffoldState.showBottomSheet(
(context) => MediaQuery.removePadding(
context: context,
removeLeft: true,
child: replyReplyPage(),
),
);
} else {
Get.to(replyReplyPage);
}
}
});
}
@@ -247,21 +261,28 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
},
icon: Transform.rotate(
angle: pi / 2,
child: Icon(Icons.splitscreen),
child: Icon(Icons.splitscreen, size: 19),
),
),
const SizedBox(width: 16),
]
: null,
),
body: refreshIndicator(
body: context.orientation == Orientation.portrait
? refreshIndicator(
onRefresh: () async {
await _dynamicDetailController.onRefresh();
},
child: Stack(
child: _buildBody(context.orientation),
)
: _buildBody(context.orientation),
);
}
Widget _buildBody(Orientation orientation) => Stack(
children: [
OrientationBuilder(
builder: (context, orientation) {
Builder(
builder: (context) {
double padding = max(context.width / 2 - Grid.maxRowWidth, 0);
if (orientation == Orientation.portrait) {
return CustomScrollView(
@@ -308,8 +329,14 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
),
Expanded(
flex: _ratio[1].toInt(),
child: Scaffold(
body: refreshIndicator(
onRefresh: () async {
await _dynamicDetailController.onRefresh();
},
child: CustomScrollView(
controller: _dynamicDetailController.scrollController,
controller:
_dynamicDetailController.scrollController,
physics: const AlwaysScrollableScrollPhysics(),
slivers: [
SliverPadding(
@@ -326,6 +353,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
],
),
),
),
),
],
);
}
@@ -361,10 +390,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
),
),
],
),
),
);
}
SliverPersistentHeader replyPersistentHeader(BuildContext context) {
return SliverPersistentHeader(
@@ -454,7 +480,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
replyItem: loadingState.response.replies[index],
showReplyRow: true,
replyLevel: '1',
replyReply: replyReply,
replyReply: (replyItem, id, isTop) =>
replyReply(context, replyItem, id, isTop),
replyType: ReplyType.values[replyType],
onReply: () {
_dynamicDetailController.onReply(
@@ -472,7 +499,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
replyItem: loadingState.response.replies[index],
showReplyRow: true,
replyLevel: '1',
replyReply: replyReply,
replyReply: (replyItem, id, isTop) =>
replyReply(context, replyItem, id, isTop),
replyType: ReplyType.values[replyType],
onReply: () {
_dynamicDetailController.onReply(

46
lib/pages/html/view.dart
View File

@@ -8,11 +8,10 @@ import 'package:PiliPalaX/pages/video/detail/reply/widgets/reply_item_grpc.dart'
import 'package:PiliPalaX/utils/extension.dart';
import 'package:PiliPalaX/utils/global_data.dart';
import 'package:PiliPalaX/utils/storage.dart';
import 'package:PiliPalaX/utils/utils.dart';
import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:get/get.dart';
import 'package:PiliPalaX/common/skeleton/video_reply.dart';
import 'package:PiliPalaX/common/widgets/html_render.dart';
@@ -106,12 +105,11 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
}
}
void replyReply(replyItem, id, isTop) {
void replyReply(context, replyItem, id, isTop) {
EasyThrottle.throttle('replyReply', const Duration(milliseconds: 500), () {
int oid = replyItem.oid.toInt();
int rpid = GlobalData().grpcReply ? replyItem.id.toInt() : replyItem.rpid;
Get.to(
() => Scaffold(
Widget replyReplyPage() => Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar(
title: Text('评论详情'),
@@ -125,8 +123,23 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
firstFloor: replyItem,
isTop: isTop ?? false,
),
);
if (this.context.orientation == Orientation.portrait) {
Get.to(replyReplyPage);
} else {
ScaffoldState? scaffoldState = Scaffold.maybeOf(context);
if (scaffoldState != null) {
scaffoldState.showBottomSheet(
(context) => MediaQuery.removePadding(
context: context,
removeLeft: true,
child: replyReplyPage(),
),
);
} else {
Get.to(replyReplyPage);
}
}
});
}
@@ -178,7 +191,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
},
icon: Transform.rotate(
angle: pi / 2,
child: Icon(Icons.splitscreen),
child: Icon(Icons.splitscreen, size: 19),
),
),
IconButton(
@@ -193,7 +206,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
icon: const Icon(Icons.open_in_browser_outlined, size: 19),
),
PopupMenuButton(
icon: const Icon(Icons.more_vert),
icon: const Icon(Icons.more_vert, size: 19),
itemBuilder: (BuildContext context) => <PopupMenuEntry>[
PopupMenuItem(
onTap: () => {
@@ -226,10 +239,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
),
),
PopupMenuItem(
onTap: () => {
Clipboard.setData(ClipboardData(text: url)),
SmartDialog.showToast('已复制'),
},
onTap: () => Utils.copyText(url),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
@@ -322,7 +332,8 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
Theme.of(context).dividerColor.withOpacity(0.05)),
Expanded(
flex: _ratio[1].toInt(),
child: CustomScrollView(
child: Scaffold(
body: CustomScrollView(
controller: _htmlRenderCtr.scrollController,
slivers: [
SliverPadding(
@@ -334,13 +345,14 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
SliverPadding(
padding: EdgeInsets.only(right: padding / 4),
sliver: Obx(
() =>
replyList(_htmlRenderCtr.loadingState.value),
() => replyList(
_htmlRenderCtr.loadingState.value),
),
),
],
),
),
),
],
],
);
@@ -414,7 +426,8 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
replyItem: loadingState.response.replies[index],
showReplyRow: true,
replyLevel: '1',
replyReply: replyReply,
replyReply: (replyItem, id, isTop) =>
replyReply(context, replyItem, id, isTop),
replyType: ReplyType.values[type],
onReply: () {
_htmlRenderCtr.onReply(
@@ -431,7 +444,8 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
replyItem: loadingState.response.replies[index],
showReplyRow: true,
replyLevel: '1',
replyReply: replyReply,
replyReply: (replyItem, id, isTop) =>
replyReply(context, replyItem, id, isTop),
replyType: ReplyType.values[type],
onReply: () {
_htmlRenderCtr.onReply(

5
lib/pages/live_room/widgets/bottom_control.dart
View File

@@ -2,7 +2,6 @@ import 'dart:io';
import 'package:floating/floating.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:PiliPalaX/models/video/play/url.dart';
import 'package:PiliPalaX/pages/live_room/index.dart';
import 'package:PiliPalaX/plugin/pl_player/index.dart';
@@ -91,9 +90,7 @@ class _BottomControlState extends State<BottomControl> {
widget.controller!.hiddenControls(false);
try {
canUsePiP = await widget.floating!.isPipAvailable;
} on PlatformException catch (_) {
canUsePiP = false;
}
} catch (_) {}
if (canUsePiP) {
await widget.floating!.enable(const EnableManual());
} else {}

8
lib/pages/login/view.dart
View File

@@ -1,6 +1,7 @@
import 'dart:ui';
import 'package:PiliPalaX/common/constants.dart';
import 'package:PiliPalaX/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
@@ -120,10 +121,9 @@ class _LoginPageState extends State<LoginPage> {
// _loginPageCtr.codeInfo.value['data']?['url'] ?? "",
// mode: LaunchMode.externalApplication);
// 复制到剪贴板
Clipboard.setData(ClipboardData(
text: _loginPageCtr.codeInfo.value['data']?['url'] ?? ""));
SmartDialog.showToast('已复制到剪贴板，可粘贴至已登录的app私信处发送，然后点击已发送的链接打开',
displayTime: const Duration(seconds: 5));
Utils.copyText(
_loginPageCtr.codeInfo.value['data']?['url'] ?? '',
toastText: '已复制到剪贴板，可粘贴至已登录的app私信处发送，然后点击已发送的链接打开');
},
child: Padding(
padding:

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

@@ -454,10 +454,7 @@ class _MemberPageState extends State<MemberPage>
const SizedBox(width: 5),
GestureDetector(
onTap: () {
Clipboard.setData(
ClipboardData(text: _memberController.mid.toString()),
);
SmartDialog.showToast('已复制${_memberController.mid}至剪贴板');
Utils.copyText(_memberController.mid.toString());
},
child: Container(
padding:

24
lib/pages/setting/pages/logs.dart
View File

@@ -1,8 +1,7 @@
import 'dart:io';
import 'package:PiliPalaX/common/widgets/loading_widget.dart';
import 'package:PiliPalaX/utils/utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../services/loggeer.dart';
class LogsPage extends StatefulWidget {
@@ -72,25 +71,17 @@ class _LogsPageState extends State<LogsPage> {
}
void copyLogs() async {
await Clipboard.setData(ClipboardData(text: fileContent));
if (context.mounted) {
await Utils.copyText(fileContent, needToast: false);
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('复制成功')),
);
}
}
void feedback() {
launchUrl(
Uri.parse('https://github.com/bggRGjQaUbCoE/PiliPalaX/issues'),
// 系统自带浏览器打开
mode: LaunchMode.externalApplication,
);
}
void clearLogsHandle() async {
if (await clearLogs()) {
if (context.mounted) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('已清空')),
);
@@ -114,7 +105,8 @@ class _LogsPageState extends State<LogsPage> {
copyLogs();
break;
case 'feedback':
feedback();
Utils.launchURL(
'https://github.com/bggRGjQaUbCoE/PiliPalaX/issues');
break;
case 'clear':
clearLogsHandle();
@@ -160,9 +152,7 @@ class _LogsPageState extends State<LogsPage> {
),
TextButton.icon(
onPressed: () async {
await Clipboard.setData(
ClipboardData(text: log['body']),
);
await Utils.copyText(log['body'], needToast: false);
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(

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

@@ -434,8 +434,7 @@ class VideoIntroController extends GetxController
),
onTap: () {
Get.back();
Clipboard.setData(ClipboardData(text: videoUrl));
SmartDialog.showToast('已复制');
Utils.copyText(videoUrl);
},
),
ListTile(

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

@@ -1008,9 +1008,8 @@ class MorePanel extends StatelessWidget {
}
break;
case 'copyAll':
await Clipboard.setData(ClipboardData(text: message));
SmartDialog.showToast('已复制');
Get.back();
Utils.copyText(message);
break;
case 'copyFreedom':
Get.back();

3
lib/pages/video/detail/reply/widgets/reply_item_grpc.dart
View File

@@ -1059,9 +1059,8 @@ class ReplyItemGrpc extends StatelessWidget {
}
break;
case 'copyAll':
await Clipboard.setData(ClipboardData(text: message));
SmartDialog.showToast('已复制');
Get.back();
Utils.copyText(message);
break;
case 'copyFreedom':
Get.back();

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

@@ -25,7 +25,6 @@ import 'package:PiliPalaX/utils/utils.dart';
import 'package:auto_orientation/auto_orientation.dart';
import 'package:easy_debounce/easy_throttle.dart';
import 'package:floating/floating.dart';
import 'package:flutter/services.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart';
@@ -164,6 +163,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
appbarStreamListen();
// lifecycleListener();
autoScreen();
if (Platform.isAndroid) {
Utils.channel.setMethodCallHandler((call) async {
if (call.method == 'onUserLeaveHint') {
if (autoPiP &&
@@ -173,6 +173,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
}
}
});
}
// _animationController = AnimationController(
// vsync: this,
// duration: const Duration(milliseconds: 300),

81
lib/pages/video/detail/widgets/header_control.dart
View File

@@ -5,6 +5,7 @@ import 'dart:math';
import 'package:PiliPalaX/pages/setting/widgets/switch_item.dart';
import 'package:PiliPalaX/utils/extension.dart';
import 'package:PiliPalaX/utils/id_utils.dart';
import 'package:PiliPalaX/utils/utils.dart';
import 'package:canvas_danmaku/canvas_danmaku.dart';
import 'package:floating/floating.dart';
import 'package:flutter/material.dart';
@@ -340,11 +341,9 @@ class _HeaderControlState extends State<HeaderControl> {
subtitle: Text(
'${player.state.width}x${player.state.height}'),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"Resolution\n${player.state.width}x${player.state.height}",
),
Utils.copyText(
'Resolution\n${player.state.width}x${player.state.height}',
needToast: false,
);
},
),
@@ -355,11 +354,9 @@ class _HeaderControlState extends State<HeaderControl> {
.state.videoParams
.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"VideoParams\n${player.state.videoParams}",
),
Utils.copyText(
'VideoParams\n${player.state.videoParams}',
needToast: false,
);
},
),
@@ -370,11 +367,9 @@ class _HeaderControlState extends State<HeaderControl> {
.state.audioParams
.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"AudioParams\n${player.state.audioParams}",
),
Utils.copyText(
'AudioParams\n${player.state.audioParams}',
needToast: false,
);
},
),
@@ -384,11 +379,9 @@ class _HeaderControlState extends State<HeaderControl> {
subtitle: Text(
player.state.playlist.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"Media\n${player.state.playlist}",
),
Utils.copyText(
'Media\n${player.state.playlist}',
needToast: false,
);
},
),
@@ -399,11 +392,9 @@ class _HeaderControlState extends State<HeaderControl> {
.state.track.audio
.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"AudioTrack\n${player.state.track.audio}",
),
Utils.copyText(
'AudioTrack\n${player.state.track.audio}',
needToast: false,
);
},
),
@@ -414,11 +405,9 @@ class _HeaderControlState extends State<HeaderControl> {
.state.track.video
.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"VideoTrack\n${player.state.track.audio}",
),
Utils.copyText(
'VideoTrack\n${player.state.track.audio}',
needToast: false,
);
},
),
@@ -428,11 +417,9 @@ class _HeaderControlState extends State<HeaderControl> {
subtitle: Text(
player.state.pitch.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"pitch\n${player.state.pitch}",
),
Utils.copyText(
'pitch\n${player.state.pitch}',
needToast: false,
);
}),
ListTile(
@@ -441,11 +428,9 @@ class _HeaderControlState extends State<HeaderControl> {
subtitle: Text(
player.state.rate.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"rate\n${player.state.rate}",
),
Utils.copyText(
'rate\n${player.state.rate}',
needToast: false,
);
}),
ListTile(
@@ -455,11 +440,9 @@ class _HeaderControlState extends State<HeaderControl> {
.state.audioBitrate
.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"AudioBitrate\n${player.state.audioBitrate}",
),
Utils.copyText(
'AudioBitrate\n${player.state.audioBitrate}',
needToast: false,
);
},
),
@@ -469,11 +452,9 @@ class _HeaderControlState extends State<HeaderControl> {
subtitle: Text(
player.state.volume.toString()),
onTap: () {
Clipboard.setData(
ClipboardData(
text:
"Volume\n${player.state.volume}",
),
Utils.copyText(
'Volume\n${player.state.volume}',
needToast: false,
);
},
),

60
lib/utils/utils.dart
View File

@@ -18,7 +18,6 @@ import 'package:PiliPalaX/utils/feed_back.dart';
import 'package:PiliPalaX/utils/login.dart';
import 'package:PiliPalaX/utils/storage.dart';
import 'package:crypto/crypto.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -437,9 +436,15 @@ class Utils {
);
}
static void copyText(String text) {
static Future copyText(
String text, {
bool needToast = true,
String? toastText,
}) async {
Clipboard.setData(ClipboardData(text: text));
SmartDialog.showToast('已复制');
if (needToast) {
SmartDialog.showToast(toastText ?? '已复制');
}
}
static launchURL(String url) async {
@@ -766,9 +771,9 @@ class Utils {
}
// 版本对比
static bool needUpdate(localVersion, remoteVersion) {
return localVersion != remoteVersion;
}
// static bool needUpdate(localVersion, remoteVersion) {
// return localVersion != remoteVersion;
// }
// 检查更新
// static Future<bool> checkUpdate() async {
@@ -859,29 +864,26 @@ class Utils {
// }
// 下载适用于当前系统的安装包
static Future matchVersion(data) async {
await SmartDialog.dismiss();
// 获取设备信息
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
if (Platform.isAndroid) {
AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
// [arm64-v8a]
String abi = androidInfo.supportedAbis.first;
late String downloadUrl;
if (data.assets.isNotEmpty) {
for (var i in data.assets) {
if (i.downloadUrl.contains(abi)) {
downloadUrl = i.downloadUrl;
}
}
// 应用外下载
launchUrl(
Uri.parse(downloadUrl),
mode: LaunchMode.externalApplication,
);
}
}
}
// static Future matchVersion(data) async {
// await SmartDialog.dismiss();
// // 获取设备信息
// DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
// if (Platform.isAndroid) {
// AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
// // [arm64-v8a]
// String abi = androidInfo.supportedAbis.first;
// late String downloadUrl;
// if (data.assets.isNotEmpty) {
// for (var i in data.assets) {
// if (i.downloadUrl.contains(abi)) {
// downloadUrl = i.downloadUrl;
// }
// }
// // 应用外下载
// launchURL(downloadUrl);
// }
// }
// }
// 时间戳转时间
static tampToSeektime(number) {