From d258474a5a69b75542ae040830c3cd9b7343b873 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Wed, 7 Feb 2024 22:23:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mod:=20=E7=9B=B4=E6=92=AD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/live/default_bg.webp | Bin 0 -> 16312 bytes lib/http/api.dart | 4 + lib/http/live.dart | 19 +++ lib/main.dart | 2 - lib/models/live/room_info_h5.dart | 130 +++++++++++++++++++ lib/pages/live_room/controller.dart | 19 ++- lib/pages/live_room/view.dart | 193 +++++++++++++++------------- lib/plugin/pl_player/view.dart | 3 +- pubspec.yaml | 1 + 9 files changed, 279 insertions(+), 92 deletions(-) create mode 100644 assets/images/live/default_bg.webp create mode 100644 lib/models/live/room_info_h5.dart diff --git a/assets/images/live/default_bg.webp b/assets/images/live/default_bg.webp new file mode 100644 index 0000000000000000000000000000000000000000..a58259dea48887982df1f1be955cf73c489bf232 GIT binary patch literal 16312 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 json) { + roomInfo = RoomInfo.fromJson(json['room_info']); + anchorInfo = AnchorInfo.fromJson(json['anchor_info']); + isRoomFeed = json['is_room_feed']; + watchedShow = json['watched_show']; + likeInfoV3 = LikeInfoV3.fromJson(json['like_info_v3']); + blockInfo = json['block_info']; + } +} + +class RoomInfo { + RoomInfo({ + this.uid, + this.roomId, + this.title, + this.cover, + this.description, + this.liveStatus, + this.liveStartTime, + this.areaId, + this.areaName, + this.parentAreaId, + this.parentAreaName, + this.online, + this.background, + this.appBackground, + this.liveId, + }); + + int? uid; + int? roomId; + String? title; + String? cover; + String? description; + int? liveStatus; + int? liveStartTime; + int? areaId; + String? areaName; + int? parentAreaId; + String? parentAreaName; + int? online; + String? background; + String? appBackground; + String? liveId; + + RoomInfo.fromJson(Map json) { + uid = json['uid']; + roomId = json['room_id']; + title = json['title']; + cover = json['cover']; + description = json['description']; + liveStatus = json['liveS_satus']; + liveStartTime = json['live_start_time']; + areaId = json['area_id']; + areaName = json['area_name']; + parentAreaId = json['parent_area_id']; + parentAreaName = json['parent_area_name']; + online = json['online']; + background = json['background']; + appBackground = json['app_background']; + liveId = json['live_id']; + } +} + +class AnchorInfo { + AnchorInfo({ + this.baseInfo, + this.relationInfo, + }); + + BaseInfo? baseInfo; + RelationInfo? relationInfo; + + AnchorInfo.fromJson(Map json) { + baseInfo = BaseInfo.fromJson(json['base_info']); + relationInfo = RelationInfo.fromJson(json['relation_info']); + } +} + +class BaseInfo { + BaseInfo({ + this.uname, + this.face, + }); + + String? uname; + String? face; + + BaseInfo.fromJson(Map json) { + uname = json['uname']; + face = json['face']; + } +} + +class RelationInfo { + RelationInfo({this.attention}); + + int? attention; + + RelationInfo.fromJson(Map json) { + attention = json['attention']; + } +} + +class LikeInfoV3 { + LikeInfoV3({this.totalLikes}); + + int? totalLikes; + + LikeInfoV3.fromJson(Map json) { + totalLikes = json['total_likes']; + } +} diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart index 2f489fec..56da0a78 100644 --- a/lib/pages/live_room/controller.dart +++ b/lib/pages/live_room/controller.dart @@ -4,6 +4,8 @@ import 'package:pilipala/http/live.dart'; import 'package:pilipala/models/live/room_info.dart'; import 'package:pilipala/plugin/pl_player/index.dart'; +import '../../models/live/room_info_h5.dart'; + class LiveRoomController extends GetxController { String cover = ''; late int roomId; @@ -21,6 +23,7 @@ class LiveRoomController extends GetxController { // controlsStyle: ControlsStyle.live, // enabledButtons: const EnabledButtons(pip: true), // ); + Rx roomInfoH5 = RoomInfoH5Model().obs; @override void onInit() { @@ -37,10 +40,11 @@ class LiveRoomController extends GetxController { } } queryLiveInfo(); + queryLiveInfoH5(); } - playerInit(source) { - plPlayerController.setDataSource( + playerInit(source) async { + await plPlayerController.setDataSource( DataSource( videoSource: source, audioSource: null, @@ -66,7 +70,8 @@ class LiveRoomController extends GetxController { String videoUrl = (item.urlInfo?.first.host)! + item.baseUrl! + item.urlInfo!.first.extra!; - playerInit(videoUrl); + await playerInit(videoUrl); + return res; } } @@ -80,4 +85,12 @@ class LiveRoomController extends GetxController { volumeOff.value = true; } } + + Future queryLiveInfoH5() async { + var res = await LiveHttp.liveRoomInfoH5(roomId: roomId); + if (res['status']) { + roomInfoH5.value = res['data']; + } + return res; + } } diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 5ac382e6..f727bfd0 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -19,6 +19,8 @@ class LiveRoomPage extends StatefulWidget { class _LiveRoomPageState extends State { final LiveRoomController _liveRoomController = Get.put(LiveRoomController()); PlPlayerController? plPlayerController; + late Future? _futureBuilder; + late Future? _futureBuilderFuture; bool isShowCover = true; bool isPlay = true; @@ -39,6 +41,8 @@ class _LiveRoomPageState extends State { if (Platform.isAndroid) { floating = Floating(); } + _futureBuilder = _liveRoomController.queryLiveInfoH5(); + _futureBuilderFuture = _liveRoomController.queryLiveInfo(); } @override @@ -52,57 +56,110 @@ class _LiveRoomPageState extends State { @override Widget build(BuildContext context) { + Widget videoPlayerPanel = FutureBuilder( + future: _futureBuilderFuture, + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.hasData && snapshot.data['status']) { + return PLVideoPlayer( + controller: plPlayerController!, + bottomControl: BottomControl( + controller: plPlayerController, + liveRoomCtr: _liveRoomController, + floating: floating, + ), + ); + } else { + return const SizedBox(); + } + }, + ); + Widget childWhenDisabled = Scaffold( primary: true, - appBar: PreferredSize( - preferredSize: Size.fromHeight( - MediaQuery.of(context).orientation == Orientation.portrait ? 56 : 0, - ), - child: AppBar( - centerTitle: false, - titleSpacing: 0, - title: _liveRoomController.liveItem != null - ? Row( - children: [ - NetworkImgLayer( - width: 34, - height: 34, - type: 'avatar', - src: _liveRoomController.liveItem.face, - ), - const SizedBox(width: 10), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - _liveRoomController.liveItem.uname, - style: const TextStyle(fontSize: 14), - ), - const SizedBox(height: 1), - if (_liveRoomController.liveItem.watchedShow != null) - Text( - _liveRoomController - .liveItem.watchedShow['text_large'] ?? - '', - style: const TextStyle(fontSize: 12)), - ], - ), - ], - ) - : const SizedBox(), - // actions: [ - // SizedBox( - // height: 34, - // child: ElevatedButton(onPressed: () {}, child: const Text('关注')), - // ), - // const SizedBox(width: 12), - // ], - ), - ), - body: Column( + backgroundColor: Colors.black, + body: Stack( children: [ - Stack( + Obx( + () => + _liveRoomController.roomInfoH5.value.roomInfo?.appBackground != + '' + ? Positioned.fill( + child: Opacity( + opacity: 0.8, + child: NetworkImgLayer( + width: Get.width, + height: Get.height, + src: _liveRoomController + .roomInfoH5.value.roomInfo?.appBackground ?? + '', + ), + ), + ) + : Image.asset( + 'assets/images/live/default_bg.webp', + width: Get.width, + height: Get.height, + ), + ), + Column( children: [ + AppBar( + centerTitle: false, + titleSpacing: 0, + backgroundColor: Colors.transparent, + foregroundColor: 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: [ + 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), + ), + ], + ), + ], + ), + ); + } else { + return const SizedBox(); + } + }, + ), + ), PopScope( canPop: plPlayerController?.isFullScreen.value != true, onPopInvoked: (bool didPop) { @@ -120,55 +177,19 @@ class _LiveRoomPageState extends State { Orientation.landscape ? Get.size.height : Get.size.width * 9 / 16, - child: plPlayerController!.videoPlayerController != null - ? PLVideoPlayer( - controller: plPlayerController!, - bottomControl: BottomControl( - controller: plPlayerController, - liveRoomCtr: _liveRoomController, - floating: floating, - ), - ) - : const SizedBox(), + child: videoPlayerPanel, ), ), - // if (_liveRoomController.liveItem != null && - // _liveRoomController.liveItem.cover != null) - // Visibility( - // visible: isShowCover, - // child: Positioned( - // top: 0, - // left: 0, - // right: 0, - // child: NetworkImgLayer( - // type: 'emote', - // src: _liveRoomController.liveItem.cover, - // width: Get.size.width, - // height: videoHeight, - // ), - // ), - // ), ], ), ], ), ); - Widget childWhenEnabled = AspectRatio( - aspectRatio: 16 / 9, - child: plPlayerController!.videoPlayerController != null - ? PLVideoPlayer( - controller: plPlayerController!, - bottomControl: BottomControl( - controller: plPlayerController, - liveRoomCtr: _liveRoomController, - ), - ) - : const SizedBox(), - ); if (Platform.isAndroid) { return PiPSwitcher( childWhenDisabled: childWhenDisabled, - childWhenEnabled: childWhenEnabled, + childWhenEnabled: videoPlayerPanel, + floating: floating, ); } else { return childWhenDisabled; diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart index 3980453b..d073945b 100644 --- a/lib/plugin/pl_player/view.dart +++ b/lib/plugin/pl_player/view.dart @@ -586,6 +586,7 @@ class _PLVideoPlayerState extends State ), /// 进度条 live模式下禁用 + Obx( () { final int value = _.sliderPositionSeconds.value; @@ -609,7 +610,7 @@ class _PLVideoPlayerState extends State } if (_.videoType.value == 'live') { - return nil; + return const SizedBox(); } if (value > max || max <= 0) { return nil; diff --git a/pubspec.yaml b/pubspec.yaml index 16df4ad7..9597eab7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -188,6 +188,7 @@ flutter: - assets/images/ - assets/images/lv/ - assets/images/logo/ + - assets/images/live/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware From 10b928474bfc96ccc32fd33d0a6b3b1ad5c1eea6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Thu, 8 Feb 2024 22:46:39 +0800 Subject: [PATCH 2/3] mod --- lib/pages/live/widgets/live_item.dart | 36 ++++++++++++------ lib/pages/live_room/view.dart | 55 +++++++++++++++++---------- 2 files changed, 59 insertions(+), 32 deletions(-) diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index 8fa797fb..9218d4fb 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -184,18 +184,32 @@ class VideoStat extends StatelessWidget { tileMode: TileMode.mirror, ), ), - child: RichText( - maxLines: 1, - textAlign: TextAlign.justify, - softWrap: false, - text: TextSpan( - style: const TextStyle(fontSize: 11, color: Colors.white), - children: [ - TextSpan(text: liveItem!.areaName!), - TextSpan(text: liveItem!.watchedShow!['text_small']), - ], - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + liveItem!.areaName!, + style: const TextStyle(fontSize: 11, color: Colors.white), + ), + Text( + liveItem!.watchedShow!['text_small'], + style: const TextStyle(fontSize: 11, color: Colors.white), + ), + ], ), + + // child: RichText( + // maxLines: 1, + // textAlign: TextAlign.justify, + // softWrap: false, + // text: TextSpan( + // style: const TextStyle(fontSize: 11, color: Colors.white), + // children: [ + // TextSpan(text: liveItem!.areaName!), + // TextSpan(text: liveItem!.watchedShow!['text_small']), + // ], + // ), + // ), ); } } diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index f727bfd0..20dfe403 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -79,27 +79,40 @@ class _LiveRoomPageState extends State { backgroundColor: Colors.black, body: Stack( children: [ - Obx( - () => - _liveRoomController.roomInfoH5.value.roomInfo?.appBackground != - '' - ? Positioned.fill( - child: Opacity( - opacity: 0.8, - child: NetworkImgLayer( - width: Get.width, - height: Get.height, - src: _liveRoomController - .roomInfoH5.value.roomInfo?.appBackground ?? - '', - ), - ), - ) - : Image.asset( - 'assets/images/live/default_bg.webp', - width: Get.width, - height: Get.height, - ), + // Obx( + // () => Positioned.fill( + // child: Opacity( + // opacity: 0.8, + // child: _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground != + // '' && + // _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground != + // null + // ? NetworkImgLayer( + // width: Get.width, + // height: Get.height, + // src: _liveRoomController + // .roomInfoH5.value.roomInfo?.appBackground ?? + // '', + // ) + // : Image.asset( + // 'assets/images/live/default_bg.webp', + // width: Get.width, + // height: Get.height, + // ), + // ), + // ), + // ), + Positioned.fill( + child: Opacity( + opacity: 0.8, + child: Image.asset( + 'assets/images/live/default_bg.webp', + width: Get.width, + height: Get.height, + ), + ), ), Column( children: [ From e2fd01a6d5154d3f068a60b0bbecad3420447c04 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Sun, 11 Feb 2024 18:47:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20video=20Storage=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 1 - lib/utils/storage.dart | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 5849f8a3..fc2149de 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -70,7 +70,6 @@ void main() async { statusBarColor: Colors.transparent, )); Data.init(); - GStrorage.lazyInit(); PiliSchame.init(); }); } diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 1b0b0c37..41ec0ce8 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -42,6 +42,8 @@ class GStrorage { return deletedEntries > 10; }, ); + // 视频设置 + video = await Hive.openBox('video'); } static void regAdapter() { @@ -52,11 +54,6 @@ class GStrorage { Hive.registerAdapter(HotSearchItemAdapter()); } - static Future lazyInit() async { - // 视频设置 - video = await Hive.openBox('video'); - } - static Future close() async { // user.compact(); // user.close();