logo和名称替换

This commit is contained in:
谢宇宁
2026-10-14 11:23:36 +07:00
parent 1cb514cd02
commit c5c04a7967
478 changed files with 8990 additions and 4948 deletions
+12 -8
View File
@@ -1,12 +1,12 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:hgmj/hj_model/splash/domain_source_model.dart';
import 'package:hgmj/hj_page/pre_sale/pre_sale_provider.dart';
import 'package:hgmj/routers/jump_router.dart';
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
import 'package:wydj/hj_model/splash/domain_source_model.dart';
import 'package:wydj/hj_page/pre_sale/pre_sale_provider.dart';
import 'package:wydj/routers/jump_router.dart';
import 'package:wydj/tools_base/widget/net_image_widget.dart';
import 'package:hgmj/hj_utils/widget_util.dart';
import 'package:wydj/hj_utils/widget_util.dart';
final limitTimeProvider = LimitTimeProvider();
@@ -26,7 +26,8 @@ class LimitTimeProvider extends ChangeNotifier {
final deadline = ValueNotifier<String>('');
/// 距截止时间的剩余秒数
int get endSeconds => bannerJump?.additionalProp?.endAt?.remainingSeconds() ?? -1;
int get endSeconds =>
bannerJump?.additionalProp?.endAt?.remainingSeconds() ?? -1;
//是否展示活动 后台返回bannerjump && 结束时间未到
bool get canShow => bannerJump != null && endSeconds > 0;
@@ -77,8 +78,11 @@ class LimitTimeBanner extends StatelessWidget {
Positioned(
right: 12,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 3),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(99), color: Colors.black.withValues(alpha: 0.2)),
padding:
const EdgeInsets.symmetric(horizontal: 18, vertical: 3),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(99),
color: Colors.black.withValues(alpha: 0.2)),
child: ValueListenableBuilder<String>(
valueListenable: limitTimeProvider.deadline,
builder: (_, value, __) => Text(
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hgmj/hj_page/pre_sale/pre_sale_page.dart';
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
import 'package:wydj/hj_page/pre_sale/pre_sale_page.dart';
import 'package:wydj/tools_base/widget/net_image_widget.dart';
import 'package:provider/provider.dart';
import 'pre_sale_provider.dart';
+23 -10
View File
@@ -2,8 +2,8 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hgmj/assets_tool/images.dart';
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
import 'package:wydj/assets_tool/images.dart';
import 'package:wydj/tools_base/widget/net_image_widget.dart';
import 'package:provider/provider.dart';
import 'pre_sale_page.dart';
@@ -17,7 +17,8 @@ class PreSaleEntry extends StatefulWidget {
State<PreSaleEntry> createState() => _PreSaleEntryState();
}
class _PreSaleEntryState extends State<PreSaleEntry> with SingleTickerProviderStateMixin {
class _PreSaleEntryState extends State<PreSaleEntry>
with SingleTickerProviderStateMixin {
//不能写成惰性 late:不展示时 build 不碰它,到 dispose 才首次创建会在已卸载的树上找 TickerMode
late final AnimationController _aniCtr;
late final Animation<double> _scaleAni;
@@ -26,9 +27,12 @@ class _PreSaleEntryState extends State<PreSaleEntry> with SingleTickerProviderSt
@override
void initState() {
super.initState();
_aniCtr = AnimationController(vsync: this, duration: const Duration(milliseconds: 900));
_scaleAni = Tween<double>(begin: 1, end: 1.02).animate(CurvedAnimation(parent: _aniCtr, curve: const Interval(0, 0.8)));
_rotateAni = Tween<double>(begin: 0, end: 2 * pi).animate(CurvedAnimation(parent: _aniCtr, curve: const Interval(0.8, 1)));
_aniCtr = AnimationController(
vsync: this, duration: const Duration(milliseconds: 900));
_scaleAni = Tween<double>(begin: 1, end: 1.02).animate(
CurvedAnimation(parent: _aniCtr, curve: const Interval(0, 0.8)));
_rotateAni = Tween<double>(begin: 0, end: 2 * pi).animate(
CurvedAnimation(parent: _aniCtr, curve: const Interval(0.8, 1)));
if (PreSaleProvider().canShowEnter) _aniCtr.repeat(reverse: true);
}
@@ -51,7 +55,8 @@ class _PreSaleEntryState extends State<PreSaleEntry> with SingleTickerProviderSt
builder: (_, __) => Transform(
transform: Matrix4.rotationZ(sin(0.2 * sin(_rotateAni.value))),
alignment: Alignment.center,
child: NetworkImageLoader(imageUrl: provider.enterBg, width: 65 * _scaleAni.value),
child: NetworkImageLoader(
imageUrl: provider.enterBg, width: 65 * _scaleAni.value),
),
),
);
@@ -73,7 +78,11 @@ class PreSaleVipEntry extends StatelessWidget {
if (!provider.canShowEnter) return const SizedBox.shrink();
return Stack(
children: [
NetworkImageLoader(imageUrl: provider.payBanner, width: double.infinity, fit: BoxFit.fill, height: 76),
NetworkImageLoader(
imageUrl: provider.payBanner,
width: double.infinity,
fit: BoxFit.fill,
height: 76),
//尾款期叠倒计时
if (provider.canPayBalance)
Positioned(
@@ -83,7 +92,10 @@ class PreSaleVipEntry extends StatelessWidget {
valueListenable: provider.deadline,
builder: (_, value, __) => Text(
'剩余 $value',
style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w700),
style: const TextStyle(
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w700),
),
),
),
@@ -103,7 +115,8 @@ class LuckyDrawButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (presaleProvider.luckyDrawH5?.isNotEmpty != true) return const SizedBox();
if (presaleProvider.luckyDrawH5?.isNotEmpty != true)
return const SizedBox();
final icon = presaleProvider.luckyDrawIcon;
return Container(
margin: margin,
+36 -11
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hgmj/hj_model/video_model.dart';
import 'package:hgmj/tools_base/widget/net_image_widget.dart';
import 'package:wydj/hj_model/video_model.dart';
import 'package:wydj/tools_base/widget/net_image_widget.dart';
import 'package:provider/provider.dart';
import '../../hj_utils/screen.dart';
@@ -31,7 +31,8 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
init: PreSaleLogic(),
builder: (logic) {
if (logic.isLoading) return const LoadingCenterWidget();
if (logic.pageData == null) return CErrorWidget(retryOnTap: logic.loadData);
if (logic.pageData == null)
return CErrorWidget(retryOnTap: logic.loadData);
return Consumer<PreSaleProvider>(
builder: (_, provider, __) => Stack(
children: [
@@ -67,7 +68,9 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 44),
height: 46,
child: logic.useActivityBtn ? PreSaleActivityButton(onTap: logic.onPay) : _upgradeButton(logic),
child: logic.useActivityBtn
? PreSaleActivityButton(onTap: logic.onPay)
: _upgradeButton(logic),
),
),
//返回
@@ -77,7 +80,8 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
child: InkWell(
enableFeedback: false,
onTap: Get.back,
child: const Icon(Icons.arrow_back_ios_sharp, size: 18, color: Colors.white),
child: const Icon(Icons.arrow_back_ios_sharp,
size: 18, color: Colors.white),
),
),
],
@@ -138,7 +142,10 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
),
child: Text(
logic.payText,
style: const TextStyle(color: Color(0xFFFFF0D3), fontSize: 16, fontWeight: FontWeight.w500),
style: const TextStyle(
color: Color(0xFFFFF0D3),
fontSize: 16,
fontWeight: FontWeight.w500),
),
),
);
@@ -158,7 +165,9 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
top: 10,
bottom: 0,
child: DecoratedBox(
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(8))),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8))),
),
),
Positioned.fill(
@@ -170,7 +179,12 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
margin: const EdgeInsets.symmetric(horizontal: 3.5),
padding: const EdgeInsets.all(4),
decoration: BoxDecoration(
boxShadow: [BoxShadow(color: const Color(0xffD43824).withValues(alpha: .2), blurRadius: 2)],
boxShadow: [
BoxShadow(
color:
const Color(0xffD43824).withValues(alpha: .2),
blurRadius: 2)
],
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
@@ -180,7 +194,10 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
//标题
Text(
'${video.vidTitle}',
style: const TextStyle(color: Color(0xffDA0101), fontWeight: FontWeight.w500, fontSize: 12),
style: const TextStyle(
color: Color(0xffDA0101),
fontWeight: FontWeight.w500,
fontSize: 12),
overflow: TextOverflow.ellipsis,
maxLines: 1,
).paddingSymmetric(horizontal: 15, vertical: 3),
@@ -189,7 +206,12 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
height: 25,
margin: const EdgeInsets.symmetric(horizontal: 16),
decoration: BoxDecoration(
boxShadow: [BoxShadow(color: const Color(0xffD43824).withValues(alpha: .2), blurRadius: 2)],
boxShadow: [
BoxShadow(
color:
const Color(0xffD43824).withValues(alpha: .2),
blurRadius: 2)
],
gradient: const LinearGradient(
colors: [Color(0xffFFF7E9), Color(0xffF9DC9A)],
begin: Alignment.topLeft,
@@ -203,7 +225,10 @@ class _PreSalePageState extends State<PreSalePage> with UniqueTagMixin {
10.sizeBoxW,
const Text(
'免费',
style: TextStyle(color: Color(0xffDA0101), fontSize: 14, fontWeight: FontWeight.w600),
style: TextStyle(
color: Color(0xffDA0101),
fontSize: 14,
fontWeight: FontWeight.w600),
),
10.sizeBoxW,
Expanded(
+38 -20
View File
@@ -2,12 +2,12 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hgmj/config/address.dart';
import 'package:hgmj/extension/extensions.dart';
import 'package:hgmj/hj_page/web_page/h5_page.dart';
import 'package:hgmj/hj_utils/date_time_util.dart';
import 'package:hgmj/tools_base/net/net_manager.dart';
import 'package:hgmj/tools_base/toast.dart';
import 'package:wydj/config/address.dart';
import 'package:wydj/extension/extensions.dart';
import 'package:wydj/hj_page/web_page/h5_page.dart';
import 'package:wydj/hj_utils/date_time_util.dart';
import 'package:wydj/tools_base/net/net_manager.dart';
import 'package:wydj/tools_base/toast.dart';
import '../../hj_model/splash/domain_source_model.dart';
import '../../hj_model/video_model.dart';
@@ -83,19 +83,23 @@ class PreSaleProvider extends ChangeNotifier {
return status == 2 || status == 3; //支付首款未付尾款
}
bool get balancePayment => preSaleModel?.detailModel?.balancePayment ?? false; //是否有尾款支付
bool get balancePayment =>
preSaleModel?.detailModel?.balancePayment ?? false; //是否有尾款支付
bool get hasLimit => advanceStatus?.privilegeLimit?.hasLimit ?? false; //是否有权益限制
bool get hasLimit =>
advanceStatus?.privilegeLimit?.hasLimit ?? false; //是否有权益限制
Remain? get remain => advanceStatus?.privilegeLimit?.remain; //剩余权限次数
String? get startTimeMD => preSaleModel?.detailModel?.startTime?.utcToCnMD();
/// 开始时间已过秒数。> 0 表示已到达开始时间
int get _startSeconds => preSaleModel?.detailModel?.startTime?.elapsedSeconds() ?? -1;
int get _startSeconds =>
preSaleModel?.detailModel?.startTime?.elapsedSeconds() ?? -1;
/// 距截止时间的剩余秒数
int get endSeconds => preSaleModel?.detailModel?.endTime?.remainingSeconds() ?? -1;
int get endSeconds =>
preSaleModel?.detailModel?.endTime?.remainingSeconds() ?? -1;
/// 是否可以支付尾款
bool get canPayBalance => isPayFirst && _startSeconds > 0;
@@ -125,15 +129,21 @@ class PreSaleProvider extends ChangeNotifier {
}
/// 预售小图标入口背景图
String get enterBg => balancePayment ? advancePage?.enterBgProc ?? '' : advancePage?.enterBgWait ?? '';
String get enterBg => balancePayment
? advancePage?.enterBgProc ?? ''
: advancePage?.enterBgWait ?? '';
/// 首页弹窗背景图(整张图就是弹窗内容)
String get popBg => balancePayment ? advancePage?.popBgProc ?? '' : advancePage?.popBgWait ?? '';
String get popBg => balancePayment
? advancePage?.popBgProc ?? ''
: advancePage?.popBgWait ?? '';
/// 预售 banner
String get payBanner {
if (!balancePayment) return advancePage?.banner ?? ''; //开启预定
return canPayBalance ? advancePage?.bannerProc ?? '' : advancePage?.bannerWait ?? ''; //开启支付尾款
return canPayBalance
? advancePage?.bannerProc ?? ''
: advancePage?.bannerWait ?? ''; //开启支付尾款
}
// ===== 数据刷新 =====
@@ -167,12 +177,14 @@ class PreSaleProvider extends ChangeNotifier {
final status = preSaleModel?.detailModel?.status ?? -1;
if (status == -1 || status == 4) return; //未知或者已经完成
//预定期直接弹;尾款期只在能付尾款时弹。两期的图由 popBg 自己分流
if (!balancePayment || canPayBalance) await Get.dialog(const PreSaleAlert());
if (!balancePayment || canPayBalance)
await Get.dialog(const PreSaleAlert());
}
// 拉起支付
/// [orderTrack] 透传下单埋点(会员中心传入 sessionId / 实验字段;预售独立页可不传)
Future<void> startPay(VipProductModel model, {PayOrderTrackInfo? orderTrack}) async {
Future<void> startPay(VipProductModel model,
{PayOrderTrackInfo? orderTrack}) async {
if (isPayFirst && _startSeconds <= 0) {
showToast("还未到尾款支付时间,无法支付~");
return;
@@ -182,9 +194,11 @@ class PreSaleProvider extends ChangeNotifier {
return;
}
//copyWith 原样带上短剧付费墙等归因字段,只补默认来源页
final track = (orderTrack ?? const PayOrderTrackInfo()).copyWith(sourcePage: orderTrack?.sourcePage ?? PaySourcePage.vipCenter);
final track = (orderTrack ?? const PayOrderTrackInfo()).copyWith(
sourcePage: orderTrack?.sourcePage ?? PaySourcePage.vipCenter);
await Get.bottomSheet(
OnlinePayPage(vipProductModel: model..isPreSale = true, orderTrack: track),
OnlinePayPage(
vipProductModel: model..isPreSale = true, orderTrack: track),
isScrollControlled: true,
);
await refreshConfig();
@@ -194,12 +208,15 @@ class PreSaleProvider extends ChangeNotifier {
Future<void> useCoinPrivilege(VideoModel? video) async {
if (video?.videoType == 1) return; // 动漫视频不享受金币权益
if (video?.freeArea == true) return;
if (video?.isCoinVideo() != true || (video?.coins ?? 0) <= 0 || video?.vidStatus?.hasPaid == true) return;
if (video?.isCoinVideo() != true ||
(video?.coins ?? 0) <= 0 ||
video?.vidStatus?.hasPaid == true) return;
if (!isOpen || isPayAll || !hasLimit) return; //没有首款权益
final count = remain?.todayCoinVideoCount ?? 0;
remain?.reduceVideoCoinCount(); //有无次数都先本地减,取数要在减之前
if (count <= 0) return; //已无次数,不必再调接口
final resp = await PreSaleService.consumePrivilege(type: PrivilegeType.coinVideo);
final resp =
await PreSaleService.consumePrivilege(type: PrivilegeType.coinVideo);
if (resp.isSuccess) {
debugLog("权益次数消费成功: ${remain?.todayCoinVideoCount}");
}
@@ -228,7 +245,8 @@ class PreSaleProvider extends ChangeNotifier {
_timer?.cancel(); // 防重入:先清掉已有定时器,杜绝多重泄漏
_timer = Timer.periodic(const Duration(seconds: 1), (timer) {
// 每秒只更新 deadline,交给 ValueListenableBuilder 局部刷新,不触发全局 notifyListeners
deadline.value = preSaleModel?.detailModel?.endTime?.countdownText() ?? '';
deadline.value =
preSaleModel?.detailModel?.endTime?.countdownText() ?? '';
if (endSeconds < 0) {
timer.cancel();
_timer = null;
+3 -3
View File
@@ -1,6 +1,6 @@
import 'package:hgmj/hj_model/splash/domain_source_model.dart';
import 'package:hgmj/tools_base/net/base_resp_bean.dart';
import 'package:hgmj/tools_base/net/http_manager.dart';
import 'package:wydj/hj_model/splash/domain_source_model.dart';
import 'package:wydj/tools_base/net/base_resp_bean.dart';
import 'package:wydj/tools_base/net/http_manager.dart';
import 'pre_sale_model.dart';