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

feat: 简单实现弹幕功能

Browse Source
This commit is contained in:
guozhigq
2023-08-29 23:10:22 +08:00
parent 5f730af347
commit dfbe3b1f6c
23 changed files with 646 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -29,6 +29,14 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
``` ```
<br/>
## 技术交流
Telegram: https://t.me/+lm_oOVmF0RJiODk1
<br/> <br/>
## 功能 ## 功能
@ -100,6 +108,7 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
- [x] 主题模式：亮色/暗色/跟随系统 - [x] 主题模式：亮色/暗色/跟随系统
- [x] 震动反馈(可选) - [x] 震动反馈(可选)
- [x] 高帧率 - [x] 高帧率
- [x] 自动全屏
- [ ] 等等 - [ ] 等等
<br/> <br/>
@ -117,11 +126,6 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
感谢使用 感谢使用
<br/>
## 技术交流
Telegram https://t.me/+lm_oOVmF0RJiODk1
<br/> <br/>

2
lib/http/api.dart
View File

@ -292,4 +292,6 @@ class Api {
// 多少人在看 // 多少人在看
// https://api.bilibili.com/x/player/online/total?aid=913663681&cid=1203559746&bvid=BV1MM4y1s7NZ&ts=56427838 // https://api.bilibili.com/x/player/online/total?aid=913663681&cid=1203559746&bvid=BV1MM4y1s7NZ&ts=56427838
static const String onlineTotal = '/x/player/online/total'; static const String onlineTotal = '/x/player/online/total';
static const String webDanmaku = '/x/v2/dm/web/seg.so';
} }

33
lib/http/danmaku.dart Normal file
View File

@ -0,0 +1,33 @@
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:pilipala/http/index.dart';
import 'package:pilipala/models/danmaku/dm.pb.dart';
import 'constants.dart';
class DanmakaHttp {
// 获取视频弹幕
static Future queryDanmaku({
required int cid,
required int segmentIndex,
}) async {
// 构建参数对象
Map<String, int> params = {
'type': 1,
'oid': cid,
'segment_index': segmentIndex,
};
// 计算函数
Future<DmSegMobileReply> computeTask(Map<String, int> params) async {
var response = await Request().get(
Api.webDanmaku,
data: params,
extra: {'resType': ResponseType.bytes},
);
return DmSegMobileReply.fromBuffer(response.data);
}
return await compute(computeTask, params);
}
}

21
lib/http/init.dart
View File

@ -41,6 +41,7 @@ class Request {
log("setCookie, ${e.toString()}"); log("setCookie, ${e.toString()}");
} }
} }
setOptionsHeaders(userInfo);
} }
if (cookie.isEmpty) { if (cookie.isEmpty) {
@ -69,6 +70,15 @@ class Request {
return token; return token;
} }
static setOptionsHeaders(userInfo) {
dio.options.headers['x-bili-mid'] = userInfo.mid.toString();
dio.options.headers['env'] = 'prod';
dio.options.headers['app-key'] = 'android64';
dio.options.headers['x-bili-aurora-eid'] = 'UlMFQVcABlAH';
dio.options.headers['x-bili-aurora-zone'] = 'sh001';
dio.options.headers['referer'] = 'https://www.bilibili.com/';
}
/* /*
* config it and create * config it and create
*/ */
@ -87,17 +97,6 @@ class Request {
}, },
); );
Box userInfoCache = GStrorage.userInfo;
var userInfo = userInfoCache.get('userInfoCache');
if (userInfo != null && userInfo.mid != null) {
options.headers['x-bili-mid'] = userInfo.mid.toString();
options.headers['env'] = 'prod';
options.headers['app-key'] = 'android64';
options.headers['x-bili-aurora-eid'] = 'UlMFQVcABlAH';
options.headers['x-bili-aurora-zone'] = 'sh001';
options.headers['referer'] = 'https://www.bilibili.com/';
}
dio = Dio(options) dio = Dio(options)
..httpClientAdapter = Http2Adapter( ..httpClientAdapter = Http2Adapter(
ConnectionManager( ConnectionManager(

9
lib/http/interceptor.dart
View File

@ -17,8 +17,6 @@ class ApiInterceptor extends Interceptor {
handler.next(options); handler.next(options);
} }
Box localCache = GStrorage.localCache;
@override @override
void onResponse(Response response, ResponseInterceptorHandler handler) { void onResponse(Response response, ResponseInterceptorHandler handler) {
try { try {
@ -29,8 +27,11 @@ class ApiInterceptor extends Interceptor {
final uri = Uri.parse(locations.first); final uri = Uri.parse(locations.first);
final accessKey = uri.queryParameters['access_key']; final accessKey = uri.queryParameters['access_key'];
final mid = uri.queryParameters['mid']; final mid = uri.queryParameters['mid'];
localCache try {
.put(LocalCacheKey.accessKey, {'mid': mid, 'value': accessKey}); Box localCache = GStrorage.localCache;
localCache.put(
LocalCacheKey.accessKey, {'mid': mid, 'value': accessKey});
} catch (_) {}
} }
} }
} }

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

@ -258,6 +258,7 @@ class BangumiIntroController extends GetxController {
Get.find<VideoDetailController>(tag: Get.arguments['heroTag']); Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
videoDetailCtr.bvid = bvid; videoDetailCtr.bvid = bvid;
videoDetailCtr.cid = cid; videoDetailCtr.cid = cid;
videoDetailCtr.danmakuCid.value = cid;
videoDetailCtr.queryVideoUrl(); videoDetailCtr.queryVideoUrl();
// 重新请求评论 // 重新请求评论
try { try {

64
lib/pages/danmaku/controller.dart Normal file
View File

@ -0,0 +1,64 @@
import 'package:pilipala/http/danmaku.dart';
import 'package:pilipala/models/danmaku/dm.pb.dart';
import 'package:pilipala/plugin/pl_player/index.dart';
class PlDanmakuController {
PlDanmakuController(this.cid, this.playerController);
final int cid;
final PlPlayerController playerController;
late Duration videoDuration;
// 按 6min 分段
int segCount = 0;
List<DmSegMobileReply> dmSegList = [];
int currentSegIndex = 0;
int currentDmIndex = 0;
void calcSegment() {
segCount = (videoDuration.inSeconds / (60 * 6)).ceil();
}
Future<List<DmSegMobileReply>> queryDanmaku() async {
dmSegList.clear();
for (int segIndex = 1; segIndex <= segCount; segIndex++) {
DmSegMobileReply result =
await DanmakaHttp.queryDanmaku(cid: cid, segmentIndex: segIndex);
if (result.elems.isNotEmpty) {
result.elems.sort((a, b) => (a.progress).compareTo(b.progress));
dmSegList.add(result);
}
}
if (dmSegList.isNotEmpty) {
findClosestPositionIndex(playerController.position.value.inMilliseconds);
}
return dmSegList;
}
/// 查询当前最接近的弹幕
void findClosestPositionIndex(int position) {
int segIndex = (position / (6 * 60 * 1000)).ceil() - 1;
if (segIndex < 0) segIndex = 0;
List elems = dmSegList[segIndex].elems;
if (segIndex < dmSegList.length) {
int left = 0;
int right = elems.length;
while (left < right) {
int mid = (right + left) ~/ 2;
var midPosition = elems[mid].progress;
if (midPosition >= position) {
right = mid;
} else {
left = mid + 1;
}
}
currentSegIndex = segIndex;
currentDmIndex = right;
} else {
currentSegIndex = segIndex;
currentDmIndex = 0;
}
}
}

4
lib/pages/danmaku/index.dart Normal file
View File

@ -0,0 +1,4 @@
library pldanmaku;
export './controller.dart';
export 'view.dart';

127
lib/pages/danmaku/view.dart Normal file
View File

@ -0,0 +1,127 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:ns_danmaku/ns_danmaku.dart';
import 'package:pilipala/pages/danmaku/index.dart';
import 'package:pilipala/plugin/pl_player/index.dart';
import 'package:pilipala/utils/danmaku.dart';
/// 传入播放器控制器，监听播放进度，加载对应弹幕
class PlDanmaku extends StatefulWidget {
final int cid;
final PlPlayerController playerController;
const PlDanmaku({
super.key,
required this.cid,
required this.playerController,
});
@override
State<PlDanmaku> createState() => _PlDanmakuState();
}
class _PlDanmakuState extends State<PlDanmaku> {
late PlPlayerController playerController;
late PlDanmakuController _plDanmakuController;
DanmakuController? _controller;
bool danmuPlayStatus = true;
@override
void initState() {
super.initState();
_plDanmakuController =
PlDanmakuController(widget.cid, widget.playerController);
if (mounted) {
playerController = widget.playerController;
_plDanmakuController.videoDuration = playerController.duration.value;
_plDanmakuController
..calcSegment()
..queryDanmaku();
playerController
..addStatusLister(playerListener)
..addPositionListener(videoPositionListen);
}
}
// 播放器状态监听
void playerListener(PlayerStatus? status) {
if (status == PlayerStatus.paused) {
_controller!.pause();
}
if (status == PlayerStatus.playing) {
_controller!.onResume();
}
}
void videoPositionListen(Duration position) {
if (!danmuPlayStatus) {
_controller!.onResume();
danmuPlayStatus = true;
}
PlDanmakuController ctr = _plDanmakuController;
int currentPosition = position.inMilliseconds;
// 超出分段数返回
if (ctr.currentSegIndex >= ctr.dmSegList.length) {
return;
}
if (ctr.dmSegList.isEmpty ||
ctr.dmSegList[ctr.currentSegIndex].elems.isEmpty) {
return;
}
// 超出当前分段的弹幕总数返回
if (ctr.currentDmIndex >= ctr.dmSegList[ctr.currentSegIndex].elems.length) {
ctr.currentDmIndex = 0;
ctr.currentSegIndex++;
return;
}
var element = ctr.dmSegList[ctr.currentSegIndex].elems[ctr.currentDmIndex];
var delta = currentPosition - element.progress;
if (delta >= 0 && delta < 200) {
_controller!.addItems([
DanmakuItem(
element.content,
color: DmUtils.decimalToColor(element.color),
time: element.progress,
type: DmUtils.getPosition(element.mode),
)
]);
ctr.currentDmIndex++;
} else {
if (!playerController.isOpenDanmu.value) {
_controller!.pause();
danmuPlayStatus = false;
return;
}
ctr.findClosestPositionIndex(position.inMilliseconds);
}
}
@override
void dispose() {
playerController.removePositionListener(videoPositionListen);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Obx(
() => AnimatedOpacity(
opacity: playerController.isOpenDanmu.value ? 1 : 0,
duration: const Duration(milliseconds: 100),
child: DanmakuView(
createdController: (DanmakuController e) async {
_controller = e;
},
option: DanmakuOption(
fontSize: 15,
area: 0.5,
duration: 5,
),
statusChanged: (isPlaying) {},
),
),
);
}
}

16
lib/pages/favDetail/controller.dart
View File

@ -15,6 +15,8 @@ class FavDetailController extends GetxController {
bool isLoadingMore = false; bool isLoadingMore = false;
RxMap favInfo = {}.obs; RxMap favInfo = {}.obs;
RxList<FavDetailItemData> favList = [FavDetailItemData()].obs; RxList<FavDetailItemData> favList = [FavDetailItemData()].obs;
RxString loadingText = '加载中...'.obs;
int mediaCount = 0;
@override @override
void onInit() { void onInit() {
@ -27,6 +29,11 @@ class FavDetailController extends GetxController {
} }
Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async { Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async {
if (type == 'onLoad' && favList.length >= mediaCount) {
loadingText.value = '没有更多了';
return;
}
isLoadingMore = true;
var res = await await UserHttp.userFavFolderDetail( var res = await await UserHttp.userFavFolderDetail(
pn: currentPage, pn: currentPage,
ps: 20, ps: 20,
@ -36,11 +43,16 @@ class FavDetailController extends GetxController {
favInfo.value = res['data'].info; favInfo.value = res['data'].info;
if (currentPage == 1 && type == 'init') { if (currentPage == 1 && type == 'init') {
favList.value = res['data'].medias; favList.value = res['data'].medias;
} else if (type == 'onload') { mediaCount = res['data'].info['media_count'];
} else if (type == 'onLoad') {
favList.addAll(res['data'].medias); favList.addAll(res['data'].medias);
} }
if (favList.length >= mediaCount) {
loadingText.value = '没有更多了';
}
} }
currentPage += 1; currentPage += 1;
isLoadingMore = false;
return res; return res;
} }
@ -64,6 +76,6 @@ class FavDetailController extends GetxController {
} }
onLoad() { onLoad() {
queryUserFavFolderDetail(type: 'onload'); queryUserFavFolderDetail(type: 'onLoad');
} }
} }

41
lib/pages/favDetail/view.dart
View File

@ -1,9 +1,12 @@
import 'dart:async'; import 'dart:async';
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/skeleton/video_card_h.dart';
import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/common/widgets/http_error.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/common/widgets/no_data.dart';
import 'package:pilipala/pages/favDetail/index.dart'; import 'package:pilipala/pages/favDetail/index.dart';
import 'widget/fav_video_card.dart'; import 'widget/fav_video_card.dart';
@ -37,10 +40,9 @@ class _FavDetailPageState extends State<FavDetailPage> {
if (_controller.position.pixels >= if (_controller.position.pixels >=
_controller.position.maxScrollExtent - 200) { _controller.position.maxScrollExtent - 200) {
if (!_favDetailController.isLoadingMore) { EasyThrottle.throttle('favDetail', const Duration(seconds: 1), () {
_favDetailController.isLoadingMore = true;
_favDetailController.onLoad(); _favDetailController.onLoad();
} });
} }
}, },
); );
@ -183,12 +185,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
Map data = snapshot.data; Map data = snapshot.data;
if (data['status']) { if (data['status']) {
if (_favDetailController.item!.mediaCount == 0) { if (_favDetailController.item!.mediaCount == 0) {
return const SliverToBoxAdapter( return const NoData();
child: SizedBox(
height: 300,
child: Center(child: Text('没有内容')),
),
);
} else { } else {
return Obx( return Obx(
() => SliverList( () => SliverList(
@ -207,18 +204,30 @@ class _FavDetailPageState extends State<FavDetailPage> {
); );
} }
} else { } else {
return const SliverToBoxAdapter( // 骨架屏
child: SizedBox( return SliverList(
height: 300, delegate: SliverChildBuilderDelegate((context, index) {
child: Center(child: Text('加载中')), return const VideoCardHSkeleton();
), }, childCount: 10),
); );
} }
}, },
), ),
SliverToBoxAdapter( SliverToBoxAdapter(
child: SizedBox( child: Container(
height: MediaQuery.of(context).padding.bottom + 20, height: MediaQuery.of(context).padding.bottom + 60,
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).padding.bottom),
child: Center(
child: Obx(
() => Text(
_favDetailController.loadingText.value,
style: TextStyle(
color: Theme.of(context).colorScheme.outline,
fontSize: 13),
),
),
),
), ),
) )
], ],

12
lib/pages/setting/play_setting.dart
View File

@ -78,6 +78,18 @@ class _PlaySettingState extends State<PlaySetting> {
setKey: SettingBoxKey.enableAutoBrightness, setKey: SettingBoxKey.enableAutoBrightness,
defaultVal: false, defaultVal: false,
), ),
const SetSwitchItem(
title: '自动全屏',
subTitle: '视频开始播放时进入全屏',
setKey: SettingBoxKey.enableAutoEnter,
defaultVal: false,
),
const SetSwitchItem(
title: '自动退出',
subTitle: '视频结束播放时退出全屏',
setKey: SettingBoxKey.enableAutoExit,
defaultVal: false,
),
ListTile( ListTile(
dense: false, dense: false,
title: Text('默认画质', style: titleStyle), title: Text('默认画质', style: titleStyle),

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

@ -21,6 +21,7 @@ class VideoDetailController extends GetxController
/// 路由传参 /// 路由传参
String bvid = Get.parameters['bvid']!; String bvid = Get.parameters['bvid']!;
int cid = int.parse(Get.parameters['cid']!); int cid = int.parse(Get.parameters['cid']!);
RxInt danmakuCid = 0.obs;
String heroTag = Get.arguments['heroTag']; String heroTag = Get.arguments['heroTag'];
// 视频详情 // 视频详情
Map videoItem = {}; Map videoItem = {};
@ -73,6 +74,7 @@ class VideoDetailController extends GetxController
// 默认记录历史记录 // 默认记录历史记录
bool enableHeart = true; bool enableHeart = true;
var userInfo; var userInfo;
late bool isFirstTime = true;
@override @override
void onInit() { void onInit() {
@ -100,6 +102,7 @@ class VideoDetailController extends GetxController
localCache.get(LocalCacheKey.historyPause) == true) { localCache.get(LocalCacheKey.historyPause) == true) {
enableHeart = false; enableHeart = false;
} }
danmakuCid.value = cid;
} }
showReplyReplyPanel() { showReplyReplyPanel() {
@ -193,6 +196,7 @@ class VideoDetailController extends GetxController
bvid: bvid, bvid: bvid,
cid: cid, cid: cid,
enableHeart: enableHeart, enableHeart: enableHeart,
isFirstTime: isFirstTime,
); );
} }
@ -233,7 +237,6 @@ class VideoDetailController extends GetxController
currentDecodeFormats = VideoDecodeFormatsCode.fromString(setting.get( currentDecodeFormats = VideoDecodeFormatsCode.fromString(setting.get(
SettingBoxKey.defaultDecode, SettingBoxKey.defaultDecode,
defaultValue: VideoDecodeFormats.values.last.code))!; defaultValue: VideoDecodeFormats.values.last.code))!;
print(currentDecodeFormats.description);
try { try {
// 当前视频没有对应格式返回第一个 // 当前视频没有对应格式返回第一个
bool flag = false; bool flag = false;
@ -287,6 +290,7 @@ class VideoDetailController extends GetxController
defaultST = Duration(milliseconds: data.lastPlayTime!); defaultST = Duration(milliseconds: data.lastPlayTime!);
if (autoPlay.value) { if (autoPlay.value) {
await playerInit(); await playerInit();
isShowCover.value = false;
} }
} else { } else {
if (result['code'] == -404) { if (result['code'] == -404) {

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

@ -418,6 +418,7 @@ class VideoIntroController extends GetxController {
Get.find<VideoDetailController>(tag: Get.arguments['heroTag']); Get.find<VideoDetailController>(tag: Get.arguments['heroTag']);
videoDetailCtr.bvid = bvid; videoDetailCtr.bvid = bvid;
videoDetailCtr.cid = cid; videoDetailCtr.cid = cid;
videoDetailCtr.danmakuCid.value = cid;
videoDetailCtr.queryVideoUrl(); videoDetailCtr.queryVideoUrl();
// 重新请求评论 // 重新请求评论
try { try {

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

@ -31,9 +31,10 @@ class VideoIntroPanel extends StatefulWidget {
class _VideoIntroPanelState extends State<VideoIntroPanel> class _VideoIntroPanelState extends State<VideoIntroPanel>
with AutomaticKeepAliveClientMixin { with AutomaticKeepAliveClientMixin {
final VideoIntroController videoIntroController = late String heroTag;
Get.put(VideoIntroController(), tag: Get.arguments['heroTag']); late VideoIntroController videoIntroController;
VideoDetailData? videoDetail; VideoDetailData? videoDetail;
late Future? _futureBuilderFuture;
// 添加页面缓存 // 添加页面缓存
@override @override
@ -42,6 +43,11 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
/// fix 全屏时参数丢失
heroTag = Get.arguments['heroTag'];
videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
_futureBuilderFuture = videoIntroController.queryVideoIntro();
videoIntroController.videoDetail.listen((value) { videoIntroController.videoDetail.listen((value) {
videoDetail = value; videoDetail = value;
}); });
@ -57,15 +63,20 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
return FutureBuilder( return FutureBuilder(
future: videoIntroController.queryVideoIntro(), future: _futureBuilderFuture,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.done) { if (snapshot.connectionState == ConnectionState.done) {
if (snapshot.data == null) {
return const SliverToBoxAdapter(child: SizedBox());
}
if (snapshot.data['status']) { if (snapshot.data['status']) {
// 请求成功 // 请求成功
return Obx( return Obx(
() => VideoInfo( () => VideoInfo(
loadingStatus: false, loadingStatus: false,
videoDetail: videoIntroController.videoDetail.value), videoDetail: videoIntroController.videoDetail.value,
heroTag: heroTag,
),
); );
} else { } else {
// 请求错误 // 请求错误
@ -79,7 +90,11 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
); );
} }
} else { } else {
return VideoInfo(loadingStatus: true, videoDetail: videoDetail); return VideoInfo(
loadingStatus: true,
videoDetail: videoDetail,
heroTag: heroTag,
);
} }
}, },
); );
@ -89,8 +104,10 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
class VideoInfo extends StatefulWidget { class VideoInfo extends StatefulWidget {
final bool loadingStatus; final bool loadingStatus;
final VideoDetailData? videoDetail; final VideoDetailData? videoDetail;
final String? heroTag;
const VideoInfo({Key? key, this.loadingStatus = false, this.videoDetail}) const VideoInfo(
{Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
: super(key: key); : super(key: key);
@override @override
@ -98,7 +115,8 @@ class VideoInfo extends StatefulWidget {
} }
class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin { class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
final String heroTag = Get.arguments['heroTag']; // final String heroTag = Get.arguments['heroTag'];
late String heroTag;
late final VideoIntroController videoIntroController; late final VideoIntroController videoIntroController;
late final VideoDetailController videoDetailCtr; late final VideoDetailController videoDetailCtr;
late final Map<dynamic, dynamic> videoItem; late final Map<dynamic, dynamic> videoItem;
@ -117,7 +135,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
heroTag = widget.heroTag!;
videoIntroController = Get.put(VideoIntroController(), tag: heroTag); videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag); videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
videoItem = videoIntroController.videoItem!; videoItem = videoIntroController.videoItem!;

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

@ -10,6 +10,7 @@ import 'package:pilipala/common/widgets/sliver_header.dart';
import 'package:pilipala/http/user.dart'; import 'package:pilipala/http/user.dart';
import 'package:pilipala/models/common/search_type.dart'; import 'package:pilipala/models/common/search_type.dart';
import 'package:pilipala/pages/bangumi/introduction/index.dart'; import 'package:pilipala/pages/bangumi/introduction/index.dart';
import 'package:pilipala/pages/danmaku/view.dart';
import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart'; import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart';
import 'package:pilipala/pages/video/detail/reply/index.dart'; import 'package:pilipala/pages/video/detail/reply/index.dart';
import 'package:pilipala/pages/video/detail/controller.dart'; import 'package:pilipala/pages/video/detail/controller.dart';
@ -41,7 +42,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
Get.put(VideoIntroController(), tag: Get.arguments['heroTag']); Get.put(VideoIntroController(), tag: Get.arguments['heroTag']);
PlayerStatus playerStatus = PlayerStatus.playing; PlayerStatus playerStatus = PlayerStatus.playing;
// bool isShowCover = true;
double doubleOffset = 0; double doubleOffset = 0;
Box localCache = GStrorage.localCache; Box localCache = GStrorage.localCache;
@ -49,11 +49,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
late double statusBarHeight; late double statusBarHeight;
final videoHeight = Get.size.width * 9 / 16; final videoHeight = Get.size.width * 9 / 16;
late Future _futureBuilderFuture; late Future _futureBuilderFuture;
// 自动退出全屏
late bool autoExitFullcreen;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
statusBarHeight = localCache.get('statusBarHeight'); statusBarHeight = localCache.get('statusBarHeight');
autoExitFullcreen =
setting.get(SettingBoxKey.enableAutoExit, defaultValue: false);
videoSourceInit(); videoSourceInit();
appbarStreamListen(); appbarStreamListen();
} }
@ -63,7 +67,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
_futureBuilderFuture = videoDetailController.queryVideoUrl(); _futureBuilderFuture = videoDetailController.queryVideoUrl();
if (videoDetailController.autoPlay.value) { if (videoDetailController.autoPlay.value) {
plPlayerController = videoDetailController.plPlayerController; plPlayerController = videoDetailController.plPlayerController;
playerListener(); plPlayerController!.addStatusLister(playerListener);
} }
} }
@ -79,23 +83,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
} }
// 播放器状态监听 // 播放器状态监听
void playerListener() { void playerListener(PlayerStatus? status) {
plPlayerController!.onPlayerStatusChanged.listen( if (status == PlayerStatus.completed) {
(PlayerStatus status) async { // 结束播放退出全屏
playerStatus = status; if (autoExitFullcreen) {
if (status == PlayerStatus.playing) { plPlayerController!.triggerFullScreen(status: false);
videoDetailController.isShowCover.value = false; }
} else { // 播放完展示控制栏
// 播放完成停止 or 切换下一个 plPlayerController!.onLockControl(false);
if (status == PlayerStatus.completed) { }
// 当只有1p或多p未打开自动播放时，播放完成还原进度条，展示控制栏
plPlayerController!.seekTo(Duration.zero);
plPlayerController!.onLockControl(false);
plPlayerController!.videoPlayerController!.pause();
}
}
},
);
} }
// 继续播放或重新播放 // 继续播放或重新播放
@ -110,11 +106,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
plPlayerController = videoDetailController.plPlayerController; plPlayerController = videoDetailController.plPlayerController;
videoDetailController.autoPlay.value = true; videoDetailController.autoPlay.value = true;
videoDetailController.isShowCover.value = false; videoDetailController.isShowCover.value = false;
playerListener();
} }
@override @override
void dispose() { void dispose() {
plPlayerController!.removeStatusLister(playerListener);
plPlayerController!.dispose(); plPlayerController!.dispose();
super.dispose(); super.dispose();
} }
@ -128,6 +124,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
} }
videoDetailController.defaultST = plPlayerController!.position.value; videoDetailController.defaultST = plPlayerController!.position.value;
videoIntroController.isPaused = true; videoIntroController.isPaused = true;
plPlayerController!.removeStatusLister(playerListener);
plPlayerController!.pause(); plPlayerController!.pause();
super.didPushNext(); super.didPushNext();
} }
@ -135,12 +132,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
@override @override
// 返回当前页面时 // 返回当前页面时
void didPopNext() async { void didPopNext() async {
videoDetailController.isFirstTime = false;
videoDetailController.playerInit(); videoDetailController.playerInit();
videoIntroController.isPaused = false; videoIntroController.isPaused = false;
if (_extendNestCtr.position.pixels == 0) { if (_extendNestCtr.position.pixels == 0) {
await Future.delayed(const Duration(milliseconds: 300)); await Future.delayed(const Duration(milliseconds: 300));
plPlayerController!.play(); plPlayerController!.play();
} }
plPlayerController!.addStatusLister(playerListener);
super.didPopNext(); super.didPopNext();
} }
@ -187,120 +186,127 @@ class _VideoDetailPageState extends State<VideoDetailPage>
builder: (context, boxConstraints) { builder: (context, boxConstraints) {
double maxWidth = boxConstraints.maxWidth; double maxWidth = boxConstraints.maxWidth;
double maxHeight = boxConstraints.maxHeight; double maxHeight = boxConstraints.maxHeight;
return Hero( return Stack(
tag: videoDetailController.heroTag, children: [
child: Stack( FutureBuilder(
children: [ future: _futureBuilderFuture,
FutureBuilder( builder: ((context, snapshot) {
future: _futureBuilderFuture, if (snapshot.hasData &&
builder: ((context, snapshot) { snapshot.data['status']) {
if (snapshot.hasData && return Obx(
snapshot.data['status']) { () => !videoDetailController
return Obx( .autoPlay.value
() => videoDetailController ? const SizedBox()
.autoPlay.value : PLVideoPlayer(
? PLVideoPlayer( controller: plPlayerController!,
headerControl: HeaderControl(
controller: controller:
plPlayerController!, plPlayerController,
headerControl: HeaderControl( videoDetailCtr:
controller: videoDetailController,
plPlayerController, ),
videoDetailCtr: danmuWidget: Obx(
videoDetailController, () => PlDanmaku(
key: Key(
videoDetailController
.danmakuCid.value
.toString()),
cid: videoDetailController
.danmakuCid.value,
playerController:
plPlayerController!,
), ),
) ),
: const SizedBox(), ),
); );
} else { } else {
return const SizedBox(); return const SizedBox();
} }
}), }),
), ),
Obx(
() => Visibility( Obx(
visible: videoDetailController () => Visibility(
.isShowCover.value, visible:
child: Positioned( videoDetailController.isShowCover.value,
top: 0, child: Positioned(
left: 0, top: 0,
right: 0, left: 0,
child: NetworkImgLayer( right: 0,
type: 'emote', child: NetworkImgLayer(
src: videoDetailController type: 'emote',
.videoItem['pic'], src: videoDetailController
width: maxWidth, .videoItem['pic'],
height: maxHeight, width: maxWidth,
), height: maxHeight,
), ),
), ),
), ),
),
/// 关闭自动播放时 手动播放 /// 关闭自动播放时 手动播放
Obx( Obx(
() => Visibility( () => Visibility(
visible: videoDetailController visible: videoDetailController
.isShowCover.value && .isShowCover.value &&
videoDetailController videoDetailController
.isEffective.value && .isEffective.value &&
!videoDetailController !videoDetailController.autoPlay.value,
.autoPlay.value, child: Stack(
child: Stack( children: [
children: [ Positioned(
Positioned( top: 0,
top: 0, left: 0,
left: 0, right: 0,
right: 0, child: AppBar(
child: AppBar( primary: false,
primary: false, foregroundColor: Colors.white,
foregroundColor: Colors.white, backgroundColor:
Colors.transparent,
actions: [
IconButton(
tooltip: '稍后再看',
onPressed: () async {
var res = await UserHttp
.toViewLater(
bvid:
videoDetailController
.bvid);
SmartDialog.showToast(
res['msg']);
},
icon: const Icon(
Icons.history_outlined),
),
const SizedBox(width: 14)
],
),
),
Positioned(
right: 12,
bottom: 10,
child: TextButton.icon(
style: ButtonStyle(
backgroundColor: backgroundColor:
Colors.transparent, MaterialStateProperty
actions: [ .resolveWith((states) {
IconButton( return Theme.of(context)
tooltip: '稍后再看', .colorScheme
onPressed: () async { .primaryContainer;
var res = await UserHttp }),
.toViewLater(
bvid:
videoDetailController
.bvid);
SmartDialog.showToast(
res['msg']);
},
icon: const Icon(
Icons.history_outlined),
),
const SizedBox(width: 14)
],
), ),
), onPressed: () => handlePlay(),
Positioned( icon: const Icon(
right: 12, Icons.play_circle_outline,
bottom: 10, size: 20,
child: TextButton.icon(
style: ButtonStyle(
backgroundColor:
MaterialStateProperty
.resolveWith(
(states) {
return Theme.of(context)
.colorScheme
.primaryContainer;
}),
),
onPressed: () => handlePlay(),
icon: const Icon(
Icons.play_circle_outline,
size: 20,
),
label: const Text('Play'),
), ),
label: const Text('Play'),
), ),
], ),
)), ],
), )),
], ),
), ],
); );
}, },
), ),

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

@ -499,6 +499,28 @@ class _HeaderControlState extends State<HeaderControl> {
// ), // ),
// fuc: () => _.screenshot(), // fuc: () => _.screenshot(),
// ), // ),
SizedBox(
width: 34,
height: 34,
child: Obx(
() => IconButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero),
),
onPressed: () {
_.isOpenDanmu.value = !_.isOpenDanmu.value;
},
icon: Icon(
_.isOpenDanmu.value
? Icons.subtitles_outlined
: Icons.subtitles_off_outlined,
size: 19,
color: Colors.white,
),
),
),
),
const SizedBox(width: 4),
Obx( Obx(
() => SizedBox( () => SizedBox(
width: 45, width: 45,

111
lib/plugin/pl_player/controller.dart
View File

@ -11,18 +11,15 @@ import 'package:hive/hive.dart';
import 'package:media_kit/media_kit.dart'; import 'package:media_kit/media_kit.dart';
import 'package:media_kit_video/media_kit_video.dart'; import 'package:media_kit_video/media_kit_video.dart';
import 'package:pilipala/http/video.dart'; import 'package:pilipala/http/video.dart';
import 'package:pilipala/plugin/pl_player/models/data_source.dart'; import 'package:pilipala/plugin/pl_player/index.dart';
import 'package:pilipala/utils/feed_back.dart'; import 'package:pilipala/utils/feed_back.dart';
import 'package:pilipala/utils/storage.dart'; import 'package:pilipala/utils/storage.dart';
import 'package:screen_brightness/screen_brightness.dart'; import 'package:screen_brightness/screen_brightness.dart';
import 'package:universal_platform/universal_platform.dart'; import 'package:universal_platform/universal_platform.dart';
// import 'package:wakelock_plus/wakelock_plus.dart'; // import 'package:wakelock_plus/wakelock_plus.dart';
import 'models/data_status.dart';
import 'models/play_speed.dart';
import 'models/play_status.dart';
Box videoStorage = GStrorage.video; Box videoStorage = GStrorage.video;
Box setting = GStrorage.setting;
class PlPlayerController { class PlPlayerController {
Player? _videoPlayerController; Player? _videoPlayerController;
@ -84,6 +81,7 @@ class PlPlayerController {
int _cid = 0; int _cid = 0;
int _heartDuration = 0; int _heartDuration = 0;
bool _enableHeart = true; bool _enableHeart = true;
bool _isFirstTime = true;
Timer? _timer; Timer? _timer;
Timer? _timerForSeek; Timer? _timerForSeek;
@ -105,6 +103,7 @@ class PlPlayerController {
]; ];
PreferredSizeWidget? headerControl; PreferredSizeWidget? headerControl;
Widget? danmuWidget;
/// 数据加载监听 /// 数据加载监听
Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream; Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
@ -195,6 +194,9 @@ class PlPlayerController {
/// ///
Rx<String> get videoType => _videoType; Rx<String> get videoType => _videoType;
/// 弹幕开关
Rx<bool> isOpenDanmu = true.obs;
// 添加一个私有构造函数 // 添加一个私有构造函数
PlPlayerController._() { PlPlayerController._() {
_videoType = videoType; _videoType = videoType;
@ -248,6 +250,8 @@ class PlPlayerController {
int cid = 0, int cid = 0,
// 历史记录开关 // 历史记录开关
bool enableHeart = true, bool enableHeart = true,
// 是否首次加载
bool isFirstTime = true,
}) async { }) async {
try { try {
_autoPlay = autoplay; _autoPlay = autoplay;
@ -261,6 +265,7 @@ class PlPlayerController {
_bvid = bvid; _bvid = bvid;
_cid = cid; _cid = cid;
_enableHeart = enableHeart; _enableHeart = enableHeart;
_isFirstTime = isFirstTime;
if (_videoPlayerController != null && if (_videoPlayerController != null &&
_videoPlayerController!.state.playing) { _videoPlayerController!.state.playing) {
@ -281,6 +286,12 @@ class PlPlayerController {
if (!_listenersInitialized) { if (!_listenersInitialized) {
startListeners(); startListeners();
} }
bool autoEnterFullcreen =
setting.get(SettingBoxKey.enableAutoEnter, defaultValue: false);
if (autoEnterFullcreen && _isFirstTime) {
await Future.delayed(const Duration(milliseconds: 100));
triggerFullScreen();
}
} catch (err) { } catch (err) {
dataStatus.status.value = DataStatus.error; dataStatus.status.value = DataStatus.error;
print('plPlayer err: $err'); print('plPlayer err: $err');
@ -397,6 +408,8 @@ class PlPlayerController {
} }
List<StreamSubscription> subscriptions = []; List<StreamSubscription> subscriptions = [];
final List<Function(Duration position)> _positionListeners = [];
final List<Function(PlayerStatus status)> _statusListeners = [];
/// 播放事件监听 /// 播放事件监听
void startListeners() { void startListeners() {
@ -408,11 +421,21 @@ class PlPlayerController {
} else { } else {
// playerStatus.status.value = PlayerStatus.paused; // playerStatus.status.value = PlayerStatus.paused;
} }
/// 触发回调事件
for (var element in _statusListeners) {
element(event ? PlayerStatus.playing : PlayerStatus.paused);
}
makeHeartBeat(_position.value.inSeconds, type: 'status'); makeHeartBeat(_position.value.inSeconds, type: 'status');
}), }),
videoPlayerController!.stream.completed.listen((event) { videoPlayerController!.stream.completed.listen((event) {
if (event) { if (event) {
playerStatus.status.value = PlayerStatus.completed; playerStatus.status.value = PlayerStatus.completed;
/// 触发回调事件
for (var element in _statusListeners) {
element(PlayerStatus.completed);
}
} else { } else {
// playerStatus.status.value = PlayerStatus.playing; // playerStatus.status.value = PlayerStatus.playing;
} }
@ -423,6 +446,11 @@ class PlPlayerController {
if (!isSliderMoving.value) { if (!isSliderMoving.value) {
_sliderPosition.value = event; _sliderPosition.value = event;
} }
/// 触发回调事件
for (var element in _positionListeners) {
element(event);
}
makeHeartBeat(event.inSeconds); makeHeartBeat(event.inSeconds);
}), }),
videoPlayerController!.stream.duration.listen((event) { videoPlayerController!.stream.duration.listen((event) {
@ -714,6 +742,79 @@ class PlPlayerController {
_isFullScreen.value = val; _isFullScreen.value = val;
} }
// 全屏
Future<void> triggerFullScreen({bool status = true}) async {
FullScreenMode mode = FullScreenModeCode.fromCode(
setting.get(SettingBoxKey.fullScreenMode, defaultValue: 0))!;
if (!isFullScreen.value && status) {
/// 按照视频宽高比决定全屏方向
switch (mode) {
case FullScreenMode.auto:
if (direction.value == 'horizontal') {
/// 进入全屏
await enterFullScreen();
// 横屏
await landScape();
} else {
// 竖屏
await verticalScreen();
}
break;
case FullScreenMode.vertical:
/// 进入全屏
await enterFullScreen();
// 横屏
await verticalScreen();
break;
case FullScreenMode.horizontal:
/// 进入全屏
await enterFullScreen();
// 横屏
await landScape();
break;
}
toggleFullScreen(true);
print(headerControl);
print(danmuWidget);
var result = await showDialog(
context: Get.context!,
useSafeArea: false,
builder: (context) => Dialog.fullscreen(
backgroundColor: Colors.black,
child: PLVideoPlayer(
controller: this,
headerControl: headerControl,
danmuWidget: danmuWidget,
),
),
);
if (result == null) {
// 退出全屏
exitFullScreen();
await verticalScreen();
toggleFullScreen(false);
}
} else if (isFullScreen.value) {
Get.back();
exitFullScreen();
await verticalScreen();
toggleFullScreen(false);
}
}
void addPositionListener(Function(Duration position) listener) =>
_positionListeners.add(listener);
void removePositionListener(Function(Duration position) listener) =>
_positionListeners.remove(listener);
void addStatusLister(Function(PlayerStatus status) listener) =>
_statusListeners.add(listener);
void removeStatusLister(Function(PlayerStatus status) listener) =>
_statusListeners.remove(listener);
/// 截屏 /// 截屏
Future screenshot() async { Future screenshot() async {
final Uint8List? screenshot = final Uint8List? screenshot =

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

@ -89,6 +89,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
vsync: this, duration: const Duration(milliseconds: 300)); vsync: this, duration: const Duration(milliseconds: 300));
videoController = widget.controller.videoController!; videoController = widget.controller.videoController!;
widget.controller.headerControl = widget.headerControl; widget.controller.headerControl = widget.headerControl;
widget.controller.danmuWidget = widget.danmuWidget;
defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior, defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior,
defaultValue: BtmProgresBehavior.values.first.code); defaultValue: BtmProgresBehavior.values.first.code);
@ -159,67 +160,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
widget.controller.brightness.value = value; widget.controller.brightness.value = value;
} }
Future<void> triggerFullScreen() async {
PlPlayerController _ = widget.controller;
mode = FullScreenModeCode.fromCode(
setting.get(SettingBoxKey.fullScreenMode, defaultValue: 0))!;
if (!_.isFullScreen.value) {
/// 按照视频宽高比决定全屏方向
switch (mode) {
case FullScreenMode.auto:
if (_.direction.value == 'horizontal') {
/// 进入全屏
await enterFullScreen();
// 横屏
await landScape();
} else {
// 竖屏
await verticalScreen();
}
break;
case FullScreenMode.vertical:
/// 进入全屏
await enterFullScreen();
// 横屏
await verticalScreen();
break;
case FullScreenMode.horizontal:
/// 进入全屏
await enterFullScreen();
// 横屏
await landScape();
break;
}
_.toggleFullScreen(true);
var result = await showDialog(
context: Get.context!,
useSafeArea: false,
builder: (context) => Dialog.fullscreen(
backgroundColor: Colors.black,
child: PLVideoPlayer(
controller: _,
headerControl: _.headerControl,
),
),
);
if (result == null) {
// 退出全屏
exitFullScreen();
await verticalScreen();
_.toggleFullScreen(false);
}
} else {
Get.back();
exitFullScreen();
await verticalScreen();
_.toggleFullScreen(false);
}
}
@override @override
void dispose() { void dispose() {
animationController.dispose(); animationController.dispose();
@ -472,6 +412,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
} }
}), }),
/// 弹幕面板
if (widget.danmuWidget != null)
Positioned.fill(top: 4, child: widget.danmuWidget!),
/// 手势 /// 手势
Positioned.fill( Positioned.fill(
left: 16, left: 16,
@ -559,13 +503,13 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
if (dy > _distance && dy > threshold) { if (dy > _distance && dy > threshold) {
if (_.isFullScreen.value) { if (_.isFullScreen.value) {
// 下滑退出全屏 // 下滑退出全屏
await triggerFullScreen(); await widget.controller.triggerFullScreen(status: false);
} }
_distance = 0.0; _distance = 0.0;
} else if (dy < _distance && dy < -threshold) { } else if (dy < _distance && dy < -threshold) {
if (!_.isFullScreen.value) { if (!_.isFullScreen.value) {
// 上滑进入全屏 // 上滑进入全屏
await triggerFullScreen(); await widget.controller.triggerFullScreen();
} }
_distance = 0.0; _distance = 0.0;
} }
@ -606,7 +550,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
position: 'bottom', position: 'bottom',
child: BottomControl( child: BottomControl(
controller: widget.controller, controller: widget.controller,
triggerFullScreen: triggerFullScreen), triggerFullScreen: widget.controller.triggerFullScreen),
), ),
), ),
], ],

24
lib/utils/danmaku.dart Normal file
View File

@ -0,0 +1,24 @@
import 'package:flutter/material.dart';
import 'package:ns_danmaku/ns_danmaku.dart';
class DmUtils {
static Color decimalToColor(int decimalColor) {
int red = (decimalColor >> 16) & 0xFF;
int green = (decimalColor >> 8) & 0xFF;
int blue = decimalColor & 0xFF;
return Color.fromARGB(255, red, green, blue);
}
static DanmakuItemType getPosition(int mode) {
DanmakuItemType type = DanmakuItemType.scroll;
if (mode >= 1 && mode <= 3) {
type = DanmakuItemType.scroll;
} else if (mode == 4) {
type = DanmakuItemType.bottom;
} else if (mode == 5) {
type = DanmakuItemType.top;
}
return type;
}
}

2
lib/utils/storage.dart
View File

@ -97,6 +97,8 @@ class SettingBoxKey {
static const String enableHA = 'enableHA'; static const String enableHA = 'enableHA';
static const String enableOnlineTotal = 'enableOnlineTotal'; static const String enableOnlineTotal = 'enableOnlineTotal';
static const String enableAutoBrightness = 'enableAutoBrightness'; static const String enableAutoBrightness = 'enableAutoBrightness';
static const String enableAutoEnter = 'enableAutoEnter';
static const String enableAutoExit = 'enableAutoExit';
/// 隐私 /// 隐私
static const String blackMidsList = 'blackMidsList'; static const String blackMidsList = 'blackMidsList';

9
pubspec.lock
View File

@ -805,6 +805,15 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.0" version: "0.5.0"
ns_danmaku:
dependency: "direct main"
description:
path: "."
ref: master
resolved-ref: "419a35a776f9784f07999c8f1f75eb26fd9fe90a"
url: "https://github.com/xiaoyaocz/flutter_ns_danmaku.git"
source: git
version: "0.0.5"
octo_image: octo_image:
dependency: transitive dependency: transitive
description: description:

6
pubspec.yaml
View File

@ -114,6 +114,12 @@ dependencies:
flutter_displaymode: ^0.6.0 flutter_displaymode: ^0.6.0
# scheme跳转 # scheme跳转
appscheme: ^1.0.8 appscheme: ^1.0.8
# 弹幕
ns_danmaku:
git:
url: https://github.com/xiaoyaocz/flutter_ns_danmaku.git
ref: master
dev_dependencies: dev_dependencies:
flutter_test: flutter_test: