diff --git a/lib/common/core/app_consts.dart b/lib/common/core/app_consts.dart index bb6a0c2..39c8fb2 100644 --- a/lib/common/core/app_consts.dart +++ b/lib/common/core/app_consts.dart @@ -12,6 +12,6 @@ class AppConsts { /// 先声SDK static String xsAppKey = 'a418'; - static String xsAppSecretKey = BasicConfig().isTestDev?'1a16f31f2611bf32fb7b3fc38f5b2c81':'c11163aa6c834a028da4a4b30955be99'; - static String xsAppService = BasicConfig().isTestDev?'ws://trial.cloud.ssapi.cn:8080':'"wss://api.cloud.ssapi.cn'; + static String xsAppSecretKey = BasicConfig.isTestDev?'1a16f31f2611bf32fb7b3fc38f5b2c81':'c11163aa6c834a028da4a4b30955be99'; + static String xsAppService = BasicConfig.isTestDev?'ws://trial.cloud.ssapi.cn:8080':'"wss://api.cloud.ssapi.cn'; } diff --git a/lib/common/request/basic_config.dart b/lib/common/request/basic_config.dart index c925b4f..26031a8 100644 --- a/lib/common/request/basic_config.dart +++ b/lib/common/request/basic_config.dart @@ -1,4 +1,19 @@ +import 'package:flutter/cupertino.dart'; + class BasicConfig { - bool isTestDev = true; - // bool isTestDev = false; + // static bool isTestDev = true; + static bool isTestDev = false; + + + // 暂时未启用 + static bool isEnvProd() { + bool kReleaseMode = const bool.fromEnvironment('dart.vm.product'); + if (kReleaseMode) { + debugPrint("dart.vm.product-现在是release环境."); + } else { + debugPrint("dart.vm.product-现在是debug环境."); + } + return kReleaseMode; + } + } diff --git a/lib/common/request/config.dart b/lib/common/request/config.dart index 2c21b3f..b6d2f71 100644 --- a/lib/common/request/config.dart +++ b/lib/common/request/config.dart @@ -3,8 +3,8 @@ import 'package:wow_english/common/request/basic_config.dart'; ///request config class RequestConfig { static String baseUrlDev = 'http://wow-app.dev.kouyuxingqiu.com/'; - static String baseUrlProd = 'http://app-api.pro.kouyuxingqiu.com/'; - static String baseUrl = BasicConfig().isTestDev ? baseUrlDev : baseUrlProd; + static String baseUrlProd = 'https://app-api.wowenglish.com.cn/'; + static String baseUrl = BasicConfig.isTestDev ? baseUrlDev : baseUrlProd; static const connectTimeout = Duration(seconds: 15); static const successCode = 200; diff --git a/lib/models/user_entity.dart b/lib/models/user_entity.dart index 5ed0e24..bd76cc8 100644 --- a/lib/models/user_entity.dart +++ b/lib/models/user_entity.dart @@ -68,6 +68,22 @@ class UserEntity { return valid ?? false; } + // 计算用户vip到期日 + String? getEffectiveDate() { + if (effectiveDate == null) { + return null; + } + DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(int.parse(effectiveDate!)); + // 获取年、月、日 + String year = dateTime.year.toString(); + String month = dateTime.month.toString().padLeft(2, '0'); // 如果月份是个位数,则在前面加上0,使其两位数 + String day = dateTime.day.toString().padLeft(2, '0'); // 如果日期是个位数,则在前面加上0,使其两位数 + + // 拼接成日期字符串 + String formattedDate = '$year-$month-$day'; + return formattedDate; + } + UserEntity copyWith({ int? id, String? name, diff --git a/lib/pages/home/bloc.dart b/lib/pages/home/bloc.dart index d3b7ff7..325ea27 100644 --- a/lib/pages/home/bloc.dart +++ b/lib/pages/home/bloc.dart @@ -9,8 +9,8 @@ import '../../utils/log_util.dart'; import 'event.dart'; import 'state.dart'; -class ModuleSelectBloc extends Bloc { - ModuleSelectBloc() : super(HomeState().init()) { +class HomeBloc extends Bloc { + HomeBloc() : super(HomeState().init()) { on(_init); } diff --git a/lib/pages/home/view.dart b/lib/pages/home/view.dart index 246970b..4dc098d 100644 --- a/lib/pages/home/view.dart +++ b/lib/pages/home/view.dart @@ -28,7 +28,7 @@ class HomePage extends StatelessWidget { Widget build(BuildContext context) { return BlocProvider( create: (BuildContext context) => - ModuleSelectBloc() + HomeBloc() ..add(InitEvent()), child: Builder(builder: (context) => _HomePageView()), ); @@ -42,7 +42,7 @@ class _HomePageView extends StatelessWidget { BlocListener(listener: (context, state) { debugPrint('WQF ModuleSelectPage BlocListener state: $state'); }), - BlocListener( + BlocListener( listener: (context, state) { Log.d("WQF HomePage listener state: $state"); if (state is UpdateDialogState) { @@ -54,7 +54,7 @@ class _HomePageView extends StatelessWidget { } Widget _homeView() => - BlocBuilder( + BlocBuilder( builder: (context, state) { return Scaffold( body: Container( diff --git a/lib/pages/home/widgets/BaseHomeHeaderWidget.dart b/lib/pages/home/widgets/BaseHomeHeaderWidget.dart index 11a2ccf..28ad771 100644 --- a/lib/pages/home/widgets/BaseHomeHeaderWidget.dart +++ b/lib/pages/home/widgets/BaseHomeHeaderWidget.dart @@ -79,7 +79,7 @@ class BaseHomeHeaderWidget extends StatelessWidget { style: TextStyle(color: Colors.white, fontSize: 30.0), )), Offstage( - offstage: AppConfigHelper.shouldHidePay(), + offstage: AppConfigHelper.shouldHidePay() || !UserUtil.isLogined(), child: Row(children: [ Image( width: 20.0.w, diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart index b12a80b..34c7dcc 100644 --- a/lib/pages/user/user_page.dart +++ b/lib/pages/user/user_page.dart @@ -120,7 +120,7 @@ class _UserView extends StatelessWidget { child: Row( children: [ Text( - "${user.effectiveDate} 到期", + "${user.getEffectiveDate()} 到期", style: TextStyle( color: const Color(0xFFE11212), fontSize: 17.sp, diff --git a/lib/utils/log_util.dart b/lib/utils/log_util.dart index 4b50c94..e594d61 100644 --- a/lib/utils/log_util.dart +++ b/lib/utils/log_util.dart @@ -3,7 +3,7 @@ import 'package:wow_english/common/request/basic_config.dart'; enum LogLevel { debug, info, warning, error } class Log { - static LogLevel level = BasicConfig().isTestDev ? LogLevel.debug : LogLevel.error; + static LogLevel level = BasicConfig.isTestDev ? LogLevel.debug : LogLevel.error; /// debug static void d(Object? object) {