logo和名称替换
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_page/short_video/short_main_video_logic.dart';
|
||||
import 'package:hgmj/hj_page/short_video/short_video_page.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/short_top_menu.dart';
|
||||
import 'package:hgmj/tools_base/widget/keep_alive_widget.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_page/short_video/short_main_video_logic.dart';
|
||||
import 'package:wydj/hj_page/short_video/short_video_page.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/short_top_menu.dart';
|
||||
import 'package:wydj/tools_base/widget/keep_alive_widget.dart';
|
||||
|
||||
import '../drama/drama_feed_page.dart';
|
||||
import '../drama/drama_list_page.dart';
|
||||
@@ -28,7 +28,8 @@ class ShortVideoMainPage extends StatelessWidget {
|
||||
Positioned.fill(
|
||||
child: Obx(
|
||||
() => logic.tabIndex.value == 0
|
||||
? Image.asset('live_main_bg2.webp'.livePath, alignment: Alignment.topCenter, fit: BoxFit.cover)
|
||||
? Image.asset('live_main_bg2.webp'.livePath,
|
||||
alignment: Alignment.topCenter, fit: BoxFit.cover)
|
||||
: logic.tabIndex.value == kDramaHotTab
|
||||
? const ColoredBox(color: Color(0xFF05000E))
|
||||
: const SizedBox.shrink(),
|
||||
@@ -45,14 +46,28 @@ class ShortVideoMainPage extends StatelessWidget {
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
//顺序必须与 kDramaTabs 一致。直播/热门短剧是普通页面,要给顶部菜单让位;两个信息流页自己铺满
|
||||
children: [
|
||||
const Padding(padding: EdgeInsets.only(top: 44), child: LiveMainPage()),
|
||||
ShortVideoPage(type: VideoListType.RECOMMEND, tabIndex: 1, superTabCtr: logic.tabCtr).keepAlive,
|
||||
DramaFeedPage(tabIndex: 2, superTabCtr: logic.tabCtr).keepAlive,
|
||||
const Padding(padding: EdgeInsets.only(top: 44), child: DramaListPage()).keepAlive,
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: 44),
|
||||
child: LiveMainPage()),
|
||||
ShortVideoPage(
|
||||
type: VideoListType.RECOMMEND,
|
||||
tabIndex: 1,
|
||||
superTabCtr: logic.tabCtr)
|
||||
.keepAlive,
|
||||
DramaFeedPage(tabIndex: 2, superTabCtr: logic.tabCtr)
|
||||
.keepAlive,
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: 44),
|
||||
child: DramaListPage())
|
||||
.keepAlive,
|
||||
],
|
||||
),
|
||||
),
|
||||
Positioned(top: 0, left: 0, right: 0, child: ShortTopMenu(tabCtr: logic.tabCtr)),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: ShortTopMenu(tabCtr: logic.tabCtr)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -2,14 +2,14 @@ import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_page/short_video/short_video_page.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/vid_service.dart';
|
||||
import 'package:hgmj/hj_utils/const.dart';
|
||||
import 'package:hgmj/hj_utils/history_util.dart';
|
||||
import 'package:hgmj/tools_base/event_bus/event_bus_util.dart';
|
||||
import 'package:hgmj/tools_base/event_bus/events.dart';
|
||||
import 'package:hgmj/tools_base/ad_manager.dart';
|
||||
import 'package:wydj/hj_page/short_video/short_video_page.dart';
|
||||
import 'package:wydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:wydj/hj_utils/api_service/vid_service.dart';
|
||||
import 'package:wydj/hj_utils/const.dart';
|
||||
import 'package:wydj/hj_utils/history_util.dart';
|
||||
import 'package:wydj/tools_base/event_bus/event_bus_util.dart';
|
||||
import 'package:wydj/tools_base/event_bus/events.dart';
|
||||
import 'package:wydj/tools_base/ad_manager.dart';
|
||||
|
||||
import '../../hj_model/splash/ads_model.dart';
|
||||
import '../../hj_model/video_model.dart';
|
||||
@@ -88,7 +88,8 @@ class ShortVideoLogic extends GetxController {
|
||||
|
||||
Future<void> _loadVideoDetail() async {
|
||||
try {
|
||||
VideoModel? videoModel = await VidService.getDetail(videoList?.first.id ?? '');
|
||||
VideoModel? videoModel =
|
||||
await VidService.getDetail(videoList?.first.id ?? '');
|
||||
if (videoModel != null) {
|
||||
secondVideoModel = videoModel;
|
||||
videoList?.removeAt(0);
|
||||
@@ -110,7 +111,8 @@ class ShortVideoLogic extends GetxController {
|
||||
loadData(isInit: true);
|
||||
}
|
||||
|
||||
Future<void> loadData({int page = 1, int pageSize = 12, bool isInit = false}) async {
|
||||
Future<void> loadData(
|
||||
{int page = 1, int pageSize = 12, bool isInit = false}) async {
|
||||
if (listType == VideoListType.SECOND) {
|
||||
return;
|
||||
}
|
||||
@@ -122,7 +124,8 @@ class ShortVideoLogic extends GetxController {
|
||||
List<VideoModel> list = [];
|
||||
try {
|
||||
if (listType == VideoListType.FOLLOW) {
|
||||
final resp = await CommonService.fetchFollowDynamics(page: page, size: pageSize, type: 1);
|
||||
final resp = await CommonService.fetchFollowDynamics(
|
||||
page: page, size: pageSize, type: 1);
|
||||
list = resp?.videos ?? [];
|
||||
hasNext = resp?.hasNext ?? false;
|
||||
} else {
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_page/short_video/short_video_logic.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/feed_ad_view.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/short_video_player.dart';
|
||||
import 'package:hgmj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:hgmj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_page/short_video/short_video_logic.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/feed_ad_view.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/short_video_player.dart';
|
||||
import 'package:wydj/tools_base/loading/loading_center_widget.dart';
|
||||
import 'package:wydj/tools_base/unique_tag_mixin.dart';
|
||||
|
||||
/// SECOND 短视频只有一个视频(入参视频需要通过视频详情接口获取权限),需要加载推荐列表数据;
|
||||
/// SECONDList 传过来的不止一个视频,不需要加载推荐列表数据(列表视频数据,都需要视频详情接口获取权限);
|
||||
@@ -133,7 +133,8 @@ class _ShortVideoPageState extends State<ShortVideoPage> with UniqueTagMixin {
|
||||
Icons.arrow_back_ios,
|
||||
color: Colors.white,
|
||||
shadows: [
|
||||
Shadow(color: Colors.black, offset: Offset(1, 1), blurRadius: 1),
|
||||
Shadow(
|
||||
color: Colors.black, offset: Offset(1, 1), blurRadius: 1),
|
||||
],
|
||||
),
|
||||
onPressed: () => Get.back(),
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:hgmj/routers/jump_router.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:wydj/routers/jump_router.dart';
|
||||
|
||||
import '../../../hj_model/splash/ads_model.dart';
|
||||
import '../../../tools_base/widget/net_image_widget.dart';
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/splash/ads_model.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:hgmj/routers/jump_router.dart';
|
||||
import 'package:hgmj/tools_base/ad_manager.dart';
|
||||
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
|
||||
import 'package:wydj/hj_model/splash/ads_model.dart';
|
||||
import 'package:wydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:wydj/routers/jump_router.dart';
|
||||
import 'package:wydj/tools_base/ad_manager.dart';
|
||||
import 'package:wydj/tools_base/widget/net_image_widget.dart';
|
||||
|
||||
/// 短视频左上角浮动广告(position=8)
|
||||
class FloatAdView extends StatefulWidget {
|
||||
@@ -21,7 +21,8 @@ class _FloatAdViewState extends State<FloatAdView> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final ad = _adInfo; // 取局部变量做类型提升,后续无需 ! 断言
|
||||
if (_isDismissed || ad == null || !AdManager().showAbTestAd) return const SizedBox.shrink();
|
||||
if (_isDismissed || ad == null || !AdManager().showAbTestAd)
|
||||
return const SizedBox.shrink();
|
||||
final cover = ad.cover;
|
||||
if (cover == null || cover.isEmpty) return const SizedBox.shrink();
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/extension/extensions.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/tools_base/video_download/download_button.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/acg_service.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:hgmj/hj_utils/api_service/drama_service.dart';
|
||||
import 'package:hgmj/hj_utils/const.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/extension/extensions.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/tools_base/video_download/download_button.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:wydj/hj_utils/api_service/acg_service.dart';
|
||||
import 'package:wydj/hj_utils/api_service/common_service.dart';
|
||||
import 'package:wydj/hj_utils/api_service/drama_service.dart';
|
||||
import 'package:wydj/hj_utils/const.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
@@ -47,7 +47,8 @@ class MediaActionMenu extends StatefulWidget {
|
||||
State<MediaActionMenu> createState() => _MediaActionMenuState();
|
||||
}
|
||||
|
||||
class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderStateMixin {
|
||||
class _MediaActionMenuState extends State<MediaActionMenu>
|
||||
with TickerProviderStateMixin {
|
||||
bool _isFollowLoading = false;
|
||||
bool _isCollectLoading = false;
|
||||
bool _isLikeLoading = false;
|
||||
@@ -91,7 +92,8 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
super.initState();
|
||||
VideoMenuSwitch.addListen(_menuListen);
|
||||
if (!_isDrama) {
|
||||
_followAniCtr = AnimationController(duration: const Duration(milliseconds: 500), vsync: this);
|
||||
_followAniCtr = AnimationController(
|
||||
duration: const Duration(milliseconds: 500), vsync: this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +113,8 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
|
||||
//局部刷新:只重建依赖该信号的子树(点赞/收藏/关注互不牵连)
|
||||
Widget _refreshOn(ValueNotifier<int> tick, Widget Function() builder) =>
|
||||
ValueListenableBuilder<int>(valueListenable: tick, builder: (_, __, ___) => builder());
|
||||
ValueListenableBuilder<int>(
|
||||
valueListenable: tick, builder: (_, __, ___) => builder());
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -138,7 +141,9 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
_likeTick,
|
||||
() => menuActionItem(
|
||||
(_video?.likeCount ?? 0).countStr,
|
||||
isLike ? 'like_red.png'.commonImgPath : 'like_white.png'.commonImgPath,
|
||||
isLike
|
||||
? 'like_red.png'.commonImgPath
|
||||
: 'like_white.png'.commonImgPath,
|
||||
onTap: _onLikeEvent,
|
||||
),
|
||||
),
|
||||
@@ -153,7 +158,9 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
_collectTick,
|
||||
() => menuActionItem(
|
||||
isCollect ? "已收藏" : "收藏",
|
||||
isCollect ? 'collect_red.png'.commonImgPath : 'collect_white.png'.commonImgPath,
|
||||
isCollect
|
||||
? 'collect_red.png'.commonImgPath
|
||||
: 'collect_white.png'.commonImgPath,
|
||||
onTap: _onCollectEvent,
|
||||
),
|
||||
),
|
||||
@@ -167,13 +174,15 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
style: _isDrama ? MediaStyle.Drama : null,
|
||||
),
|
||||
itemGap.sizeBoxH,
|
||||
menuActionItem('分享', 'share_arrow.png'.videoPath, onTap: _onShareEvent),
|
||||
menuActionItem('分享', 'share_arrow.png'.videoPath,
|
||||
onTap: _onShareEvent),
|
||||
itemGap.sizeBoxH,
|
||||
menuActionItem(
|
||||
'切换',
|
||||
"line_white2.png".videoPath,
|
||||
onTap: () async {
|
||||
if (await VideoLineMenuAlert.show()) widget.onSwitchLine?.call();
|
||||
if (await VideoLineMenuAlert.show())
|
||||
widget.onSwitchLine?.call();
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
@@ -182,7 +191,9 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
),
|
||||
),
|
||||
// 眼睛按钮常驻:仅切换图标(eye_open/eye_close),menuActionItem 内置 AnimatedSwitcher 交叉淡入
|
||||
menuActionItem("", (show ? "eye_open.png" : "eye_close.png").videoPath, onTap: () {
|
||||
menuActionItem(
|
||||
"", (show ? "eye_open.png" : "eye_close.png").videoPath,
|
||||
onTap: () {
|
||||
//广播给本页其他播放器/进度条,再刷新自身
|
||||
VideoMenuSwitch.toggle();
|
||||
setState(() {});
|
||||
@@ -199,7 +210,8 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
children: [
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => Get.to(() => UserCenterPage(uid: _video?.publisher?.uid ?? 0)),
|
||||
onTap: () =>
|
||||
Get.to(() => UserCenterPage(uid: _video?.publisher?.uid ?? 0)),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
child: NetworkImageLoader(
|
||||
@@ -215,7 +227,8 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
onTap: _onFollowEvent,
|
||||
child: _refreshOn(
|
||||
_followTick,
|
||||
() => CollectStatusWrapper(videoModel: _video, builder: _buildFollowPlus),
|
||||
() => CollectStatusWrapper(
|
||||
videoModel: _video, builder: _buildFollowPlus),
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -232,7 +245,9 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
turns: ctr,
|
||||
child: ScaleTransition(
|
||||
scale: Tween<double>(begin: 1, end: 0).animate(
|
||||
CurvedAnimation(parent: ctr, curve: const Interval(0.5, 1.0, curve: Curves.easeIn)),
|
||||
CurvedAnimation(
|
||||
parent: ctr,
|
||||
curve: const Interval(0.5, 1.0, curve: Curves.easeIn)),
|
||||
),
|
||||
child: Image.asset('add_red.webp'.videoPath, width: 16, height: 16),
|
||||
),
|
||||
@@ -248,11 +263,14 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
try {
|
||||
final preCollect = isCollect;
|
||||
if (_isDrama) {
|
||||
await (preCollect ? ACGService.deleteBookshelf(_objId ?? '') : ACGService.addBookshelf(_objId ?? ''));
|
||||
await (preCollect
|
||||
? ACGService.deleteBookshelf(_objId ?? '')
|
||||
: ACGService.addBookshelf(_objId ?? ''));
|
||||
} else {
|
||||
await MineService.postCollect(_objId, "SHORT", !preCollect);
|
||||
}
|
||||
_video?.collectCount = (_video?.collectCount ?? (preCollect ? 1 : 0)) + (preCollect ? -1 : 1);
|
||||
_video?.collectCount = (_video?.collectCount ?? (preCollect ? 1 : 0)) +
|
||||
(preCollect ? -1 : 1);
|
||||
_video?.vidStatus?.hasCollected = !preCollect;
|
||||
if (!preCollect) showToast("收藏成功");
|
||||
_collectTick.value++;
|
||||
@@ -274,7 +292,8 @@ class _MediaActionMenuState extends State<MediaActionMenu> with TickerProviderSt
|
||||
await CommonService.sendLike(_objId, _likeType);
|
||||
showToast("已点赞");
|
||||
}
|
||||
_video?.likeCount = (_video?.likeCount ?? (preLike ? 1 : 0)) + (preLike ? -1 : 1);
|
||||
_video?.likeCount =
|
||||
(_video?.likeCount ?? (preLike ? 1 : 0)) + (preLike ? -1 : 1);
|
||||
_video?.vidStatus?.hasLiked = !preLike;
|
||||
_likeTick.value++;
|
||||
} catch (e) {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_utils/const.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/indicator/custom_tab_indicator.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_utils/const.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/indicator/custom_tab_indicator.dart';
|
||||
|
||||
import '../../home/search_page/search_main_page.dart';
|
||||
import '../short_main_video_logic.dart';
|
||||
@@ -33,7 +33,8 @@ class ShortTopMenu extends StatelessWidget {
|
||||
borderRadius: BorderRadius.circular(2),
|
||||
),
|
||||
labelColor: Colors.white.withValues(alpha: 0.9),
|
||||
labelStyle: const TextStyle(fontSize: 15, fontWeight: FontWeight.w500),
|
||||
labelStyle:
|
||||
const TextStyle(fontSize: 15, fontWeight: FontWeight.w500),
|
||||
unselectedLabelColor: Colors.white.withValues(alpha: 0.55),
|
||||
unselectedLabelStyle: const TextStyle(fontSize: 15),
|
||||
labelPadding: EdgeInsets.zero,
|
||||
@@ -45,7 +46,8 @@ class ShortTopMenu extends StatelessWidget {
|
||||
),
|
||||
InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: () => Get.to(SearchMainPage(initialResultType: MediaStyle.Drama)),
|
||||
onTap: () =>
|
||||
Get.to(SearchMainPage(initialResultType: MediaStyle.Drama)),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.only(bottom: 2),
|
||||
child: Image.asset(
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/media_action_menu.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:hgmj/hj_page/video/view/long_video_status.dart';
|
||||
import 'package:hgmj/hj_utils/const.dart';
|
||||
import 'package:hgmj/hj_utils/free_play_manager.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/ad_manager.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/media_action_menu.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:wydj/hj_page/video/view/long_video_status.dart';
|
||||
import 'package:wydj/hj_utils/const.dart';
|
||||
import 'package:wydj/hj_utils/free_play_manager.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/ad_manager.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
import '../../../hj_model/splash/watch_count_model.dart';
|
||||
@@ -71,7 +71,8 @@ class _ShortVideoMenuState extends State<ShortVideoMenu> {
|
||||
children: [
|
||||
Container(
|
||||
//底部留白避开文字广告条:无广告 40,有广告(type33) 56
|
||||
padding: EdgeInsets.only(bottom: AdManager().adsByType(33).isEmpty ? 40 : 56),
|
||||
padding: EdgeInsets.only(
|
||||
bottom: AdManager().adsByType(33).isEmpty ? 40 : 56),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
@@ -320,7 +321,9 @@ class _ShortVideoMenuState extends State<ShortVideoMenu> {
|
||||
),
|
||||
child: Text(
|
||||
isShowFreeCount ? "免费视频剩余${watchValue + 1}次" : "开通会员 畅享完整版",
|
||||
style: TextStyle(color: isShowFreeCount ? Color(0xffFF9D00) : Color(0xff7B0000), fontSize: 12),
|
||||
style: TextStyle(
|
||||
color: isShowFreeCount ? Color(0xffFF9D00) : Color(0xff7B0000),
|
||||
fontSize: 12),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import 'package:flutter/cupertino.dart' show CupertinoActivityIndicator;
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/app_colors.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/float_ad_view.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/short_video_menu.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/short_video_player_logic.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_progress_widget.dart';
|
||||
import 'package:hgmj/hj_page/video/view/video_mask_buy_view.dart';
|
||||
import 'package:hgmj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:wydj/assets_tool/app_colors.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/float_ad_view.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/short_video_menu.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/short_video_player_logic.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_progress_widget.dart';
|
||||
import 'package:wydj/hj_page/video/view/video_mask_buy_view.dart';
|
||||
import 'package:wydj/tools_base/unique_tag_mixin.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
import 'package:visibility_detector/visibility_detector.dart';
|
||||
|
||||
@@ -36,7 +36,8 @@ class ShortVideoPlayer extends StatefulWidget {
|
||||
}
|
||||
|
||||
// PageView 里 2~3 条同时存活,用 per-实例唯一 tag 隔离各自的播放器 logic
|
||||
class _ShortVideoPlayerState extends State<ShortVideoPlayer> with UniqueTagMixin {
|
||||
class _ShortVideoPlayerState extends State<ShortVideoPlayer>
|
||||
with UniqueTagMixin {
|
||||
//进度条压暗档位:滑动中 / 挂着买量蒙层都用这一档
|
||||
static const _dimOpacity = 0.4;
|
||||
|
||||
@@ -94,7 +95,10 @@ class _ShortVideoPlayerState extends State<ShortVideoPlayer> with UniqueTagMixin
|
||||
),
|
||||
_bufferLoading(logic),
|
||||
Container(
|
||||
padding: EdgeInsets.only(bottom: widget.listType == VideoListType.SECOND ? Get.mediaQuery.padding.bottom : 0),
|
||||
padding: EdgeInsets.only(
|
||||
bottom: widget.listType == VideoListType.SECOND
|
||||
? Get.mediaQuery.padding.bottom
|
||||
: 0),
|
||||
child: ShortVideoMenu(
|
||||
videoModel: logic.video,
|
||||
playerCtr: logic.playerCtr,
|
||||
@@ -138,13 +142,16 @@ class _ShortVideoPlayerState extends State<ShortVideoPlayer> with UniqueTagMixin
|
||||
/// 无 isScrolling 信号则常显
|
||||
Widget _progressBar(ShortVideoPlayerLogic logic) {
|
||||
//二级页进度条贴底,避让系统手势条(home indicator),否则 thumb 和横线重合难点中;其他场景不加
|
||||
final bottomSafe = widget.listType == VideoListType.SECOND ? Get.mediaQuery.padding.bottom + 10 : 0.0;
|
||||
final bottomSafe = widget.listType == VideoListType.SECOND
|
||||
? Get.mediaQuery.padding.bottom + 10
|
||||
: 0.0;
|
||||
final Widget bar = VideoProgressWidget(
|
||||
controller: logic.playerCtr,
|
||||
padding: EdgeInsets.only(left: 12, right: 12, bottom: bottomSafe),
|
||||
);
|
||||
final scrolling = widget.isScrolling;
|
||||
if (scrolling == null) return Opacity(opacity: logic.showBuyMask ? _dimOpacity : 1, child: bar);
|
||||
if (scrolling == null)
|
||||
return Opacity(opacity: logic.showBuyMask ? _dimOpacity : 1, child: bar);
|
||||
return ValueListenableBuilder<bool>(
|
||||
valueListenable: scrolling,
|
||||
//只做透明+屏蔽点击,不能用 Visibility——它会卸载 child,重建时 initState 会拿旧 controller 挂监听
|
||||
@@ -163,13 +170,16 @@ class _ShortVideoPlayerState extends State<ShortVideoPlayer> with UniqueTagMixin
|
||||
/// 未就绪/缓冲中的居中转圈。直接监听 playerCtr(本身是 ValueNotifier),
|
||||
/// 切视频/切线路换了控制器时 ValueListenableBuilder 会自动改订阅,无需手动 add/removeListener
|
||||
Widget _bufferLoading(ShortVideoPlayerLogic logic) {
|
||||
const indicator = Center(child: CupertinoActivityIndicator(color: AppColors.actionRed, radius: 15));
|
||||
const indicator = Center(
|
||||
child:
|
||||
CupertinoActivityIndicator(color: AppColors.actionRed, radius: 15));
|
||||
final ctr = logic.playerCtr;
|
||||
if (ctr == null) return indicator; // 控制器还没建好,同样转圈
|
||||
return ValueListenableBuilder<VideoPlayerValue>(
|
||||
valueListenable: ctr,
|
||||
builder: (_, value, __) => !value.isInitialized || value.isBuffering ? indicator : const SizedBox(),
|
||||
builder: (_, value, __) => !value.isInitialized || value.isBuffering
|
||||
? indicator
|
||||
: const SizedBox(),
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_player_base_logic.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_player_base_logic.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
|
||||
import '../../../alert/video/buy_vip_alert.dart';
|
||||
import '../../../alert/vip_guide/guide_bottom_sheet.dart';
|
||||
@@ -19,7 +19,8 @@ import '../short_video_page.dart';
|
||||
/// 单条短视频的试看/付费逻辑。播放器本身的机制(建控制器、265 降级、可见性播停)在基类。
|
||||
/// PageView 每项一个实例,由页面用唯一 tag 隔离
|
||||
class ShortVideoPlayerLogic extends VideoPlayerBaseLogic {
|
||||
ShortVideoPlayerLogic({required this.index, required this.videoInfo, this.listType});
|
||||
ShortVideoPlayerLogic(
|
||||
{required this.index, required this.videoInfo, this.listType});
|
||||
|
||||
/// index / videoInfo 会被页面同步刷新:列表可能用**同 id 的新对象**替换某条
|
||||
/// (如首条拉完详情后 removeAt+insert),PageView 按 id 做 key 会复用 State,
|
||||
@@ -106,7 +107,8 @@ class ShortVideoPlayerLogic extends VideoPlayerBaseLogic {
|
||||
// 历史记录已统一收到 ShortVideoLogic.onPageChanged:滑到即记,与播放器/权限/进度无关
|
||||
// vip用遮罩, 金币用弹窗;有金币免费观看次数时不再要求购买
|
||||
final status = videoStatus;
|
||||
final isNeedBuy = status.isNeedBuy && (watchCount?.coinWatchCount ?? -1) < 0;
|
||||
final isNeedBuy =
|
||||
status.isNeedBuy && (watchCount?.coinWatchCount ?? -1) < 0;
|
||||
if (!isNeedBuy && !status.isNeedVip) return;
|
||||
_showPayAhead(); // 场景1(短):under7/over7 播满3秒的前置提示
|
||||
if (position < (video?.freeTime ?? 10)) return;
|
||||
@@ -145,7 +147,8 @@ class ShortVideoPlayerLogic extends VideoPlayerBaseLogic {
|
||||
await TimedPopupManager().trigger(
|
||||
canShow: () => _canShowGuide,
|
||||
//短视频按钮无价文案;长视频才用默认的「立即开通 · 仅需¥价格」
|
||||
onShow: () async => goVip = await GuideBottomSheet.showVideo(buttonText: '开通会员 · 查看完整内容'),
|
||||
onShow: () async =>
|
||||
goVip = await GuideBottomSheet.showVideo(buttonText: '开通会员 · 查看完整内容'),
|
||||
);
|
||||
// 跳了会员页就不恢复播放;滑到别条 / 期间被试看结束拦下弹了蒙层,由 syncPlay 兜住
|
||||
if (goVip || isClosed) return;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/assets_tool/images.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_player_base_logic.dart';
|
||||
import 'package:hgmj/hj_page/video/video_full_page.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:wydj/assets_tool/images.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_player_base_logic.dart';
|
||||
import 'package:wydj/hj_page/video/video_full_page.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
typedef MenuSwitchCallback = void Function(bool); // true 显示
|
||||
@@ -17,9 +17,11 @@ class VideoMenuSwitch {
|
||||
|
||||
static final List<MenuSwitchCallback> _listeners = [];
|
||||
|
||||
static void addListen(MenuSwitchCallback callback) => _listeners.add(callback);
|
||||
static void addListen(MenuSwitchCallback callback) =>
|
||||
_listeners.add(callback);
|
||||
|
||||
static void removeLister(MenuSwitchCallback callback) => _listeners.remove(callback);
|
||||
static void removeLister(MenuSwitchCallback callback) =>
|
||||
_listeners.remove(callback);
|
||||
|
||||
static void toggle() {
|
||||
isShow = !isShow;
|
||||
@@ -35,7 +37,8 @@ class VideoMenuSwitch {
|
||||
}
|
||||
|
||||
/// 操作台右侧的动作项:图标 + 文案,图标切换(点赞/收藏选中态)带缩放淡入
|
||||
Widget menuActionItem(String title, String imgPath, {GestureTapCallback? onTap}) {
|
||||
Widget menuActionItem(String title, String imgPath,
|
||||
{GestureTapCallback? onTap}) {
|
||||
return InkWell(
|
||||
enableFeedback: false,
|
||||
onTap: onTap,
|
||||
@@ -58,7 +61,11 @@ Widget menuActionItem(String title, String imgPath, {GestureTapCallback? onTap})
|
||||
//FittedBox 让线路名之类的长文案缩成一行,别撑成两行把菜单项间距顶乱
|
||||
if (title.isNotEmpty)
|
||||
FittedBox(
|
||||
child: Text(title, style: const TextStyle(color: Color(0xffDCDCDC), fontSize: 11, fontWeight: FontWeight.w500)),
|
||||
child: Text(title,
|
||||
style: const TextStyle(
|
||||
color: Color(0xffDCDCDC),
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w500)),
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -109,7 +116,8 @@ class CenterPlayPause extends StatefulWidget {
|
||||
State<CenterPlayPause> createState() => CenterPlayPauseState();
|
||||
}
|
||||
|
||||
class CenterPlayPauseState extends State<CenterPlayPause> with SingleTickerProviderStateMixin {
|
||||
class CenterPlayPauseState extends State<CenterPlayPause>
|
||||
with SingleTickerProviderStateMixin {
|
||||
// play_pause 形变进度:0=播放三角,1=暂停双杠
|
||||
late final AnimationController _morphCtr = AnimationController(
|
||||
duration: const Duration(milliseconds: 260),
|
||||
@@ -217,9 +225,11 @@ class FullScreenButton extends StatelessWidget {
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Image.asset('full_screen.webp'.videoPath, width: 14, height: 14),
|
||||
Image.asset('full_screen.webp'.videoPath,
|
||||
width: 14, height: 14),
|
||||
4.sizeBoxW,
|
||||
const Text('全屏观看', style: TextStyle(color: Colors.white, fontSize: 12)),
|
||||
const Text('全屏观看',
|
||||
style: TextStyle(color: Colors.white, fontSize: 12)),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:hgmj/hj_model/video_model.dart';
|
||||
import 'package:hgmj/hj_utils/codec_support.dart';
|
||||
import 'package:hgmj/hj_utils/play_diagnose.dart';
|
||||
import 'package:hgmj/hj_utils/video_view_type.dart';
|
||||
import 'package:hgmj/tools_base/toast.dart';
|
||||
import 'package:wydj/hj_model/video_model.dart';
|
||||
import 'package:wydj/hj_utils/codec_support.dart';
|
||||
import 'package:wydj/hj_utils/play_diagnose.dart';
|
||||
import 'package:wydj/hj_utils/video_view_type.dart';
|
||||
import 'package:wydj/tools_base/toast.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
import 'package:visibility_detector/visibility_detector.dart';
|
||||
|
||||
@@ -141,7 +141,8 @@ abstract class VideoPlayerBaseLogic extends GetxController {
|
||||
/// [model] 显式传入而不读 getter:失败重试链要一路用同一个 model
|
||||
Future<void> initPlayer(VideoModel? model, {bool isRetry = false}) async {
|
||||
if (isClosed) return; // 已销毁(快速滑走/失败重试排队中),别再建控制器,否则没人释放
|
||||
VideoPlayerController? preVideoCtr = playerCtr; // 旧控制器,切线路/失败后需释放(声明在 try 外,catch 才能拿到)
|
||||
VideoPlayerController? preVideoCtr =
|
||||
playerCtr; // 旧控制器,切线路/失败后需释放(声明在 try 外,catch 才能拿到)
|
||||
try {
|
||||
preVideoCtr?.pause();
|
||||
int prePosition = preVideoCtr?.value.position.inSeconds ?? 0;
|
||||
@@ -154,7 +155,8 @@ abstract class VideoPlayerBaseLogic extends GetxController {
|
||||
playerCtr = PlayerFactory.network(_playUrl); // 仅网络播放,不走本地文件
|
||||
notify();
|
||||
await playerCtr?.initialize();
|
||||
if (isRetry) confirmPlatformView(); // 仅重试成功(同视频 textureView 挂、platformView 放出)才落本地
|
||||
if (isRetry)
|
||||
confirmPlatformView(); // 仅重试成功(同视频 textureView 挂、platformView 放出)才落本地
|
||||
preVideoCtr?.removeListener(_onProgress);
|
||||
preVideoCtr?.dispose(); // 切线路/刷新:释放旧控制器,避免解码器泄漏累积导致后续视频全部加载失败
|
||||
// initialize 期间可能已被销毁(快速连滑),playerCtr 已在 onClose() 里释放,
|
||||
@@ -231,7 +233,8 @@ abstract class VideoPlayerBaseLogic extends GetxController {
|
||||
//所以再认播放器自己的 isCompleted 兜底(播完必为 true 且会通知一次,seek 回去自动转 false)。
|
||||
//duration 为 0 的异常流 isCompleted 也是 true,必须由外层这个条件挡住,别刚起播就当播完
|
||||
if (duration.inMilliseconds > 0 &&
|
||||
(ctr.value.isCompleted || position.inMilliseconds >= duration.inMilliseconds - 300)) {
|
||||
(ctr.value.isCompleted ||
|
||||
position.inMilliseconds >= duration.inMilliseconds - 300)) {
|
||||
//回调只发一次:条件成立后每个 tick 都会再进来
|
||||
if (!_completedSent) {
|
||||
_completedSent = true;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import 'package:hgmj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:hgmj/hj_utils/date_time_util.dart';
|
||||
import 'package:hgmj/hj_utils/screen.dart';
|
||||
import 'package:hgmj/tools_base/debug_log.dart';
|
||||
import 'package:wydj/hj_page/short_video/view/video_menu_kit.dart';
|
||||
import 'package:wydj/hj_utils/date_time_util.dart';
|
||||
import 'package:wydj/hj_utils/screen.dart';
|
||||
import 'package:wydj/tools_base/debug_log.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
|
||||
const double _kSliderThumbRadius = 6; //滑杆圆点外圈半径(按设计稿外圈直径12;轨道两端按此内缩,避免压到时间文字)
|
||||
@@ -127,8 +127,10 @@ class _VideoProgressWidgetState extends State<VideoProgressWidget> {
|
||||
final result = _clampSeek(duration);
|
||||
final minMs = widget.minSeekDuration?.inMilliseconds;
|
||||
final maxMs = widget.maxSeekDuration?.inMilliseconds;
|
||||
if (minMs != null && result.inMilliseconds < minMs) return widget.minSeekDuration!;
|
||||
if (maxMs != null && result.inMilliseconds > maxMs) return widget.maxSeekDuration!;
|
||||
if (minMs != null && result.inMilliseconds < minMs)
|
||||
return widget.minSeekDuration!;
|
||||
if (maxMs != null && result.inMilliseconds > maxMs)
|
||||
return widget.maxSeekDuration!;
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -199,14 +201,17 @@ class _VideoProgressWidgetState extends State<VideoProgressWidget> {
|
||||
_timeKey = totalText;
|
||||
_timeWidth = _measureWidth(totalText);
|
||||
}
|
||||
final curSeconds = _displaySeek?.inSeconds ?? playerCtr?.value.position.inSeconds ?? 0;
|
||||
final curSeconds =
|
||||
_displaySeek?.inSeconds ?? playerCtr?.value.position.inSeconds ?? 0;
|
||||
return Row(
|
||||
children: [
|
||||
_timeText(curSeconds, alignment: Alignment.centerRight, forceHour: forceHour),
|
||||
_timeText(curSeconds,
|
||||
alignment: Alignment.centerRight, forceHour: forceHour),
|
||||
3.sizeBoxW,
|
||||
Expanded(child: _buildSlider()),
|
||||
3.sizeBoxW,
|
||||
_timeText(totalSeconds, alignment: Alignment.centerLeft, forceHour: forceHour),
|
||||
_timeText(totalSeconds,
|
||||
alignment: Alignment.centerLeft, forceHour: forceHour),
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -217,7 +222,10 @@ class _VideoProgressWidgetState extends State<VideoProgressWidget> {
|
||||
final painter = TextPainter(
|
||||
text: TextSpan(
|
||||
text: text,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 12, fontFeatures: [FontFeature.tabularFigures()]),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 12,
|
||||
fontFeatures: [FontFeature.tabularFigures()]),
|
||||
),
|
||||
textDirection: TextDirection.ltr,
|
||||
textScaler: MediaQuery.textScalerOf(context),
|
||||
@@ -229,13 +237,18 @@ class _VideoProgressWidgetState extends State<VideoProgressWidget> {
|
||||
//tabularFigures 必须要:宽度是拿总时长那串量的,两边共用;iOS 系统字体数字是比例宽度
|
||||
//(0 比 1 宽不少),00:05 会比 16:31 宽而撑出 SizedBox,被最左端的圆点压住。
|
||||
//等宽数字后所有时间串同宽,顺带消掉秒数跳动时的左右抖动
|
||||
Widget _timeText(int seconds, {required Alignment alignment, bool forceHour = false}) => SizedBox(
|
||||
Widget _timeText(int seconds,
|
||||
{required Alignment alignment, bool forceHour = false}) =>
|
||||
SizedBox(
|
||||
width: _timeWidth,
|
||||
child: Align(
|
||||
alignment: alignment,
|
||||
child: Text(
|
||||
_formatTime(seconds, forceHour: forceHour),
|
||||
style: const TextStyle(color: Colors.white, fontSize: 12, fontFeatures: [FontFeature.tabularFigures()]),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 12,
|
||||
fontFeatures: [FontFeature.tabularFigures()]),
|
||||
maxLines: 1,
|
||||
softWrap: false,
|
||||
),
|
||||
@@ -283,7 +296,8 @@ class _VideoTrackShape extends SliderTrackShape {
|
||||
final top = offset.dy + (parentBox.size.height - h) / 2;
|
||||
//左右各内缩一个圆点半径,thumb 到达两端时不越界压到时间文字
|
||||
final w = parentBox.size.width - _kSliderThumbRadius * 2;
|
||||
return Rect.fromLTWH(offset.dx + _kSliderThumbRadius, top, w > 0 ? w : 0, h);
|
||||
return Rect.fromLTWH(
|
||||
offset.dx + _kSliderThumbRadius, top, w > 0 ? w : 0, h);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -299,13 +313,19 @@ class _VideoTrackShape extends SliderTrackShape {
|
||||
required TextDirection textDirection,
|
||||
required Offset thumbCenter,
|
||||
}) {
|
||||
final rect = getPreferredRect(parentBox: parentBox, sliderTheme: sliderTheme, offset: offset);
|
||||
final rect = getPreferredRect(
|
||||
parentBox: parentBox, sliderTheme: sliderTheme, offset: offset);
|
||||
final canvas = context.canvas;
|
||||
//整条轨道裁成圆角(高度一半=胶囊),内部两段平涂:外侧两端圆角、thumb 处接缝平齐
|
||||
canvas.save();
|
||||
canvas.clipRRect(RRect.fromRectAndRadius(rect, Radius.circular(rect.height / 2)));
|
||||
canvas.drawRect(Rect.fromLTRB(rect.left, rect.top, thumbCenter.dx, rect.bottom), _active);
|
||||
canvas.drawRect(Rect.fromLTRB(thumbCenter.dx, rect.top, rect.right, rect.bottom), _inactive);
|
||||
canvas.clipRRect(
|
||||
RRect.fromRectAndRadius(rect, Radius.circular(rect.height / 2)));
|
||||
canvas.drawRect(
|
||||
Rect.fromLTRB(rect.left, rect.top, thumbCenter.dx, rect.bottom),
|
||||
_active);
|
||||
canvas.drawRect(
|
||||
Rect.fromLTRB(thumbCenter.dx, rect.top, rect.right, rect.bottom),
|
||||
_inactive);
|
||||
canvas.restore();
|
||||
}
|
||||
}
|
||||
@@ -318,7 +338,8 @@ class _VideoThumbShape extends SliderComponentShape {
|
||||
const _VideoThumbShape();
|
||||
|
||||
@override
|
||||
Size getPreferredSize(bool isEnabled, bool isDiscrete) => Size.fromRadius(_kSliderThumbRadius);
|
||||
Size getPreferredSize(bool isEnabled, bool isDiscrete) =>
|
||||
Size.fromRadius(_kSliderThumbRadius);
|
||||
|
||||
@override
|
||||
void paint(
|
||||
|
||||
Reference in New Issue
Block a user