EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-21 00:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mod: horizontal live room

Browse Source 
Closes #62

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-02-23 16:59:46 +08:00
parent 16de044d3d
commit 14129e8f21
3 changed files with 306 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

523
lib/pages/live_room/view.dart
View File

@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'dart:math';
import 'package:PiliPlus/http/live.dart'; import 'package:PiliPlus/http/live.dart';
import 'package:PiliPlus/pages/live_room/widgets/chat.dart'; import 'package:PiliPlus/pages/live_room/widgets/chat.dart';
@@ -73,11 +74,11 @@ class _LiveRoomPageState extends State<LiveRoomPage>
_updateFontSize(); _updateFontSize();
} }
}); });
WidgetsBinding.instance.addPostFrameCallback((_) { // WidgetsBinding.instance.addPostFrameCallback((_) {
if (context.orientation == Orientation.landscape) { // if (context.orientation == Orientation.landscape) {
plPlayerController.triggerFullScreen(status: true); // plPlayerController.triggerFullScreen(status: true);
} // }
}); // });
} }
void _updateFontSize() async { void _updateFontSize() async {
@@ -130,12 +131,18 @@ class _LiveRoomPageState extends State<LiveRoomPage>
} }
} }
Widget get videoPlayerPanel { final GlobalKey videoPlayerKey = GlobalKey();
final GlobalKey playerKey = GlobalKey();
Widget videoPlayerPanel([Color? fill]) {
return FutureBuilder( return FutureBuilder(
key: videoPlayerKey,
future: _futureBuilderFuture, future: _futureBuilderFuture,
builder: (BuildContext context, AsyncSnapshot snapshot) { builder: (BuildContext context, AsyncSnapshot snapshot) {
if (snapshot.hasData && snapshot.data['status']) { if (snapshot.hasData && snapshot.data['status']) {
return PLVideoPlayer( return PLVideoPlayer(
key: playerKey,
fill: fill,
plPlayerController: plPlayerController, plPlayerController: plPlayerController,
bottomControl: BottomControl( bottomControl: BottomControl(
controller: plPlayerController, controller: plPlayerController,
@@ -176,11 +183,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
); );
} }
Widget get childWhenDisabled { Widget childWhenDisabled(bool isPortrait) {
return Scaffold( return ColoredBox(
primary: true, color: Colors.black,
backgroundColor: Colors.black, child: Stack(
body: Stack(
children: [ children: [
Positioned( Positioned(
left: 0, left: 0,
@@ -221,211 +227,22 @@ class _LiveRoomPageState extends State<LiveRoomPage>
: const SizedBox(), : const SizedBox(),
), ),
), ),
Column( isPortrait
children: [ ? Scaffold(
AppBar( backgroundColor: Colors.transparent,
backgroundColor: Colors.transparent, body: Column(
foregroundColor: Colors.white, children: [
titleTextStyle: TextStyle(color: Colors.white), _buildAppBar,
toolbarHeight: ..._buildBodyP,
MediaQuery.of(context).orientation == Orientation.portrait ],
? 56
: 0,
title: FutureBuilder(
future: _futureBuilder,
builder: (context, snapshot) {
if (snapshot.data == null) {
return const SizedBox();
}
Map data = snapshot.data as Map;
if (data['status']) {
return Obx(
() => Row(
children: [
GestureDetector(
onTap: () {
_node.unfocus();
dynamic uid = _liveRoomController
.roomInfoH5.value.roomInfo?.uid;
Get.toNamed(
'/member?mid=$uid',
arguments: {
'heroTag': Utils.makeHeroTag(uid),
},
);
},
child: NetworkImgLayer(
width: 34,
height: 34,
type: 'avatar',
src: _liveRoomController.roomInfoH5.value
.anchorInfo!.baseInfo!.face,
),
),
const SizedBox(width: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_liveRoomController.roomInfoH5.value
.anchorInfo!.baseInfo!.uname!,
style: const TextStyle(fontSize: 14),
),
const SizedBox(height: 1),
if (_liveRoomController
.roomInfoH5.value.watchedShow !=
null)
Text(
_liveRoomController.roomInfoH5.value
.watchedShow!['text_large'] ??
'',
style: const TextStyle(fontSize: 12),
),
],
),
const Spacer(),
//刷新
IconButton(
tooltip: '刷新',
onPressed: () {
_futureBuilderFuture =
_liveRoomController.queryLiveInfo();
// videoSourceInit();
},
icon: const Icon(Icons.refresh),
),
//内置浏览器打开
IconButton(
tooltip: '浏览器打开',
onPressed: () {
Utils.inAppWebview(
'https://live.bilibili.com/h5/${_liveRoomController.roomId}',
off: true,
);
},
icon: const Icon(Icons.open_in_browser)),
],
),
);
} else {
return const SizedBox();
}
},
),
),
Obx(
() => PopScope(
canPop: plPlayerController.isFullScreen.value != true,
onPopInvokedWithResult: (bool didPop, Object? result) {
if (plPlayerController.isFullScreen.value == true) {
plPlayerController.triggerFullScreen(status: false);
// if (MediaQuery.of(context).orientation ==
// Orientation.landscape) {
// verticalScreenForTwoSeconds();
// }
}
},
child: Listener(
onPointerDown: (_) {
_node.unfocus();
},
child: SizedBox(
width: Get.size.width,
height: MediaQuery.of(context).orientation ==
Orientation.landscape
? Get.size.height
: Get.size.width * 9 / 16,
child: videoPlayerPanel,
),
), ),
), )
), : Column(
Expanded(
child: Listener(
onPointerDown: (_) {
_node.unfocus();
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: LiveRoomChat(
roomId: _roomId,
liveRoomController: _liveRoomController,
),
),
),
),
Container(
padding: EdgeInsets.only(
left: 10,
top: 10,
right: 10,
bottom: 25 + MediaQuery.of(context).padding.bottom,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
),
border: Border(
top: BorderSide(color: Color(0x1AFFFFFF)),
),
color: Color(0x1AFFFFFF),
),
child: Row(
children: [ children: [
Obx( _buildAppBar,
() => IconButton( _buildBodyH,
onPressed: () {
plPlayerController.isOpenDanmu.value =
!plPlayerController.isOpenDanmu.value;
GStorage.setting.put(SettingBoxKey.enableShowDanmaku,
plPlayerController.isOpenDanmu.value);
},
icon: Icon(
plPlayerController.isOpenDanmu.value
? Icons.subtitles_outlined
: Icons.subtitles_off_outlined,
color: _color,
),
),
),
Expanded(
child: TextField(
focusNode: _node,
controller: _ctr,
textInputAction: TextInputAction.send,
cursorColor: _color,
style: TextStyle(color: _color),
onSubmitted: (value) {
if (value.isNotEmpty) {
_onSendMsg(value);
}
},
decoration: InputDecoration(
border: InputBorder.none,
hintText: '发送弹幕',
hintStyle: TextStyle(
color: Colors.white.withOpacity(0.6),
),
),
),
),
IconButton(
onPressed: () {
if (_ctr.text.isNotEmpty) {
_onSendMsg(_ctr.text);
}
},
icon: Icon(
Icons.send,
color: _color,
),
),
], ],
), ),
),
],
),
], ],
), ),
); );
@@ -436,19 +253,280 @@ class _LiveRoomPageState extends State<LiveRoomPage>
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
_updateFontSize(); _updateFontSize();
}); });
if (Platform.isAndroid) { return OrientationBuilder(
return PiPSwitcher( builder: (BuildContext context, Orientation orientation) {
getChildWhenDisabled: () => childWhenDisabled, if (Platform.isAndroid) {
getChildWhenEnabled: () => videoPlayerPanel, return PiPSwitcher(
floating: floating, getChildWhenDisabled: () =>
); childWhenDisabled(orientation == Orientation.portrait),
} else { getChildWhenEnabled: () => videoPlayerPanel,
return childWhenDisabled; floating: floating,
} );
} else {
return childWhenDisabled(orientation == Orientation.portrait);
}
},
);
} }
Color get _color => Color(0xFFEEEEEE); Color get _color => Color(0xFFEEEEEE);
Widget get _buildAppBar => AppBar(
backgroundColor: Colors.transparent,
foregroundColor: Colors.white,
titleTextStyle: TextStyle(color: Colors.white),
toolbarHeight:
MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0,
title: FutureBuilder(
future: _futureBuilder,
builder: (context, snapshot) {
if (snapshot.data == null) {
return const SizedBox();
}
Map data = snapshot.data as Map;
if (data['status']) {
return Obx(
() => Row(
children: [
GestureDetector(
onTap: () {
_node.unfocus();
dynamic uid =
_liveRoomController.roomInfoH5.value.roomInfo?.uid;
Get.toNamed(
'/member?mid=$uid',
arguments: {
'heroTag': Utils.makeHeroTag(uid),
},
);
},
child: NetworkImgLayer(
width: 34,
height: 34,
type: 'avatar',
src: _liveRoomController
.roomInfoH5.value.anchorInfo!.baseInfo!.face,
),
),
const SizedBox(width: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_liveRoomController
.roomInfoH5.value.anchorInfo!.baseInfo!.uname!,
style: const TextStyle(fontSize: 14),
),
const SizedBox(height: 1),
if (_liveRoomController.roomInfoH5.value.watchedShow !=
null)
Text(
_liveRoomController.roomInfoH5.value
.watchedShow!['text_large'] ??
'',
style: const TextStyle(fontSize: 12),
),
],
),
const Spacer(),
//刷新
IconButton(
tooltip: '刷新',
onPressed: () {
_futureBuilderFuture =
_liveRoomController.queryLiveInfo();
// videoSourceInit();
},
icon: const Icon(Icons.refresh),
),
//内置浏览器打开
IconButton(
tooltip: '浏览器打开',
onPressed: () {
Utils.inAppWebview(
'https://live.bilibili.com/h5/${_liveRoomController.roomId}',
off: true,
);
},
icon: const Icon(Icons.open_in_browser)),
],
),
);
} else {
return const SizedBox();
}
},
),
);
Widget get _buildBodyH {
double videoWidth =
max(context.height / context.width * 1.04, 0.58) * context.width;
return Expanded(
child: Row(
children: [
Obx(
() => PopScope(
canPop: plPlayerController.isFullScreen.value != true,
onPopInvokedWithResult: (bool didPop, Object? result) {
if (plPlayerController.isFullScreen.value == true) {
plPlayerController.triggerFullScreen(status: false);
}
},
child: Listener(
onPointerDown: (_) {
_node.unfocus();
},
child: SizedBox(
width: plPlayerController.isFullScreen.value
? Get.size.width
: videoWidth,
height: plPlayerController.isFullScreen.value
? Get.size.height
: Get.size.width * 9 / 16,
child: MediaQuery.removePadding(
removeRight: true,
context: context,
child: videoPlayerPanel(Colors.transparent),
),
),
),
),
),
Expanded(
child: Scaffold(
backgroundColor: Colors.transparent,
body: SafeArea(
left: false,
top: false,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: _buildBottomWidget,
),
),
),
),
],
),
);
}
List<Widget> get _buildBodyP => [
Obx(
() => PopScope(
canPop: plPlayerController.isFullScreen.value != true,
onPopInvokedWithResult: (bool didPop, Object? result) {
if (plPlayerController.isFullScreen.value == true) {
plPlayerController.triggerFullScreen(status: false);
}
},
child: Listener(
onPointerDown: (_) {
_node.unfocus();
},
child: SizedBox(
width: Get.size.width,
height: plPlayerController.isFullScreen.value
? Get.size.height
: Get.size.width * 9 / 16,
child: videoPlayerPanel(),
),
),
),
),
..._buildBottomWidget,
];
final GlobalKey chatKey = GlobalKey();
List<Widget> get _buildBottomWidget => [
Expanded(
child: Listener(
onPointerDown: (_) {
_node.unfocus();
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 16),
child: LiveRoomChat(
key: chatKey,
roomId: _roomId,
liveRoomController: _liveRoomController,
),
),
),
),
Container(
padding: EdgeInsets.only(
left: 10,
top: 10,
right: 10,
bottom: 25 + MediaQuery.of(context).padding.bottom,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
),
border: Border(
top: BorderSide(color: Color(0x1AFFFFFF)),
),
color: Color(0x1AFFFFFF),
),
child: Row(
children: [
Obx(
() => IconButton(
onPressed: () {
plPlayerController.isOpenDanmu.value =
!plPlayerController.isOpenDanmu.value;
GStorage.setting.put(SettingBoxKey.enableShowDanmaku,
plPlayerController.isOpenDanmu.value);
},
icon: Icon(
plPlayerController.isOpenDanmu.value
? Icons.subtitles_outlined
: Icons.subtitles_off_outlined,
color: _color,
),
),
),
Expanded(
child: TextField(
focusNode: _node,
controller: _ctr,
textInputAction: TextInputAction.send,
cursorColor: _color,
style: TextStyle(color: _color),
onSubmitted: (value) {
if (value.isNotEmpty) {
_onSendMsg(value);
}
},
decoration: InputDecoration(
border: InputBorder.none,
hintText: '发送弹幕',
hintStyle: TextStyle(
color: Colors.white.withOpacity(0.6),
),
),
),
),
IconButton(
onPressed: () {
if (_ctr.text.isNotEmpty) {
_onSendMsg(_ctr.text);
}
},
icon: Icon(
Icons.send,
color: _color,
),
),
],
),
)
];
void _onSendMsg(msg) async { void _onSendMsg(msg) async {
if (!_isLogin) { if (!_isLogin) {
SmartDialog.showToast('未登录'); SmartDialog.showToast('未登录');
@@ -458,6 +536,9 @@ class _LiveRoomPageState extends State<LiveRoomPage>
roomId: _liveRoomController.roomId, msg: msg); roomId: _liveRoomController.roomId, msg: msg);
if (res['status']) { if (res['status']) {
_ctr.clear(); _ctr.clear();
if (mounted) {
FocusScope.of(context).unfocus();
}
SmartDialog.showToast('发送成功'); SmartDialog.showToast('发送成功');
} else { } else {
SmartDialog.showToast(res['msg']); SmartDialog.showToast(res['msg']);

2
lib/pages/video/detail/reply_new/reply_page.dart
View File

@@ -34,7 +34,7 @@ class ReplyPage extends CommonPublishPage {
} }
class _ReplyPageState extends CommonPublishPageState<ReplyPage> { class _ReplyPageState extends CommonPublishPageState<ReplyPage> {
RxBool _syncToDynamic = false.obs; final RxBool _syncToDynamic = false.obs;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

3
lib/plugin/pl_player/view.dart
View File

@@ -53,6 +53,7 @@ class PLVideoPlayer extends StatefulWidget {
this.customWidgets, this.customWidgets,
this.showEpisodes, this.showEpisodes,
this.showViewPoints, this.showViewPoints,
this.fill,
super.key, super.key,
}); });
@@ -68,6 +69,7 @@ class PLVideoPlayer extends StatefulWidget {
final List<Widget>? customWidgets; final List<Widget>? customWidgets;
final Function? showEpisodes; final Function? showEpisodes;
final VoidCallback? showViewPoints; final VoidCallback? showViewPoints;
final Color? fill;
@override @override
State<PLVideoPlayer> createState() => _PLVideoPlayerState(); State<PLVideoPlayer> createState() => _PLVideoPlayerState();
@@ -844,6 +846,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
flipX: plPlayerController.flipX.value, flipX: plPlayerController.flipX.value,
flipY: plPlayerController.flipY.value, flipY: plPlayerController.flipY.value,
child: Video( child: Video(
fill: widget.fill ?? Colors.black,
key: plPlayerController.key, key: plPlayerController.key,
controller: videoController, controller: videoController,
controls: NoVideoControls, controls: NoVideoControls,