diff --git a/assets/images/bouncedbg.png b/assets/images/bouncedbg.png new file mode 100644 index 0000000..ff1a3e7 Binary files /dev/null and b/assets/images/bouncedbg.png differ diff --git a/lib/constants/api.dart b/lib/constants/api.dart index a2aba97..8d30395 100644 --- a/lib/constants/api.dart +++ b/lib/constants/api.dart @@ -62,6 +62,9 @@ class _App { ///更新VIP状态（已合并至用户信息） String get updateVip => '/app/user/updateVip'; + + ///会员体验 + String get trialVip => '/app/user/trialVip'; } class _Pay { diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 028acdd..46c2bab 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -73,6 +73,10 @@ class $AssetsImagesGen { /// File path: assets/images/bg.png AssetGenImage get bg => const AssetGenImage('assets/images/bg.png'); + /// File path: assets/images/bouncedbg.png + AssetGenImage get bouncedbg => + const AssetGenImage('assets/images/bouncedbg.png'); + /// File path: assets/images/emptylist.png AssetGenImage get emptylist => const AssetGenImage('assets/images/emptylist.png'); diff --git a/lib/model/network/api_client.dart b/lib/model/network/api_client.dart index 0dee325..0c04024 100644 --- a/lib/model/network/api_client.dart +++ b/lib/model/network/api_client.dart @@ -76,6 +76,7 @@ class ApiClient { return baseModel; } + // ///上传图片 // Future uploadImage(File file) async { // var response = await _dio.post( diff --git a/lib/model/user_info_model.dart b/lib/model/user_info_model.dart index d35ed39..fabfe75 100644 --- a/lib/model/user_info_model.dart +++ b/lib/model/user_info_model.dart @@ -14,6 +14,7 @@ class UserInfoModel extends Equatable { final int status; final int start; final int end; + final int isTrial; final List? contentRef; final List? contentCon; @@ -27,6 +28,7 @@ class UserInfoModel extends Equatable { name: '', phone: '', isVip: 0, + isTrial: 0, tag: '', status: 0, start: 0, @@ -40,6 +42,7 @@ class UserInfoModel extends Equatable { required this.name, required this.phone, required this.isVip, + required this.isTrial, required this.tag, required this.status, required this.start, diff --git a/lib/model/user_info_model.g.dart b/lib/model/user_info_model.g.dart index 4e82a93..ec210e9 100644 --- a/lib/model/user_info_model.g.dart +++ b/lib/model/user_info_model.g.dart @@ -12,6 +12,7 @@ UserInfoModel _$UserInfoModelFromJson(Map json) => name: json['name'] as String, phone: json['phone'] as String, isVip: json['is_vip'] as int, + isTrial: json['is_trial'] as int, tag: json['tag']as String, status: json['status'] as int, start: json['start']as int, @@ -30,6 +31,7 @@ Map _$UserInfoModelToJson(UserInfoModel instance) => 'name': instance.name, 'phone': instance.phone, 'is_vip':instance.isVip, + 'is_trial':instance.isTrial, 'tag':instance.tag, 'status': instance.status, 'start':instance.start, diff --git a/lib/ui/home/content_connect_page.dart b/lib/ui/home/content_connect_page.dart index 1e0ad22..fccdb89 100644 --- a/lib/ui/home/content_connect_page.dart +++ b/lib/ui/home/content_connect_page.dart @@ -75,7 +75,6 @@ class _ContentConnectPageState extends State }else{ _wasAnswerRefreshController.callRefresh(); } - // }, indicator: RectangularIndicator( color: Colors.white, diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index 2e92434..afa35a5 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -3,11 +3,14 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; import 'package:flutter_background_service/flutter_background_service.dart'; + import 'package:permission_handler/permission_handler.dart'; import 'package:project_telephony/ui/home/content_connect_page.dart'; import 'package:project_telephony/ui/home/content_refuse_page.dart'; import 'package:project_telephony/ui/user/privacy_rights_page.dart'; -import 'package:project_telephony/ui/user/privacy_rights_page.dart'; +import 'package:project_telephony/ui/widget/appdialog.dart'; + +import 'package:project_telephony/ui/widget/plone_bottom.dart'; import 'package:project_telephony/utils/headers.dart'; @@ -28,6 +31,8 @@ bool kg=false; final service = FlutterBackgroundService(); @override class _HomePageState extends State with WidgetsBindingObserver { + + @override void initState() { super.initState(); @@ -77,6 +82,12 @@ class _HomePageState extends State with WidgetsBindingObserver { ), ), Positioned(top: 48.w, child: _warning()), + // Positioned(child: PloneBottom(onTap: (){ + // showDialog(context: context, builder: (context){ + // return const AppDialog(); + // }); + // + // })), Positioned(bottom: 64.w, child: _getBody()), Align( child: SizedBox( diff --git a/lib/ui/tab_navigator.dart b/lib/ui/tab_navigator.dart index 09c85dd..edfd04c 100644 --- a/lib/ui/tab_navigator.dart +++ b/lib/ui/tab_navigator.dart @@ -79,9 +79,9 @@ class _TabNavigatorState extends State return true; }, child: TabBarView( - children: _pages, controller: _tabController, physics: const NeverScrollableScrollPhysics(), + children: _pages, ), ), bottomNavigationBar: BottomNavigationBar( diff --git a/lib/ui/user/user_page.dart b/lib/ui/user/user_page.dart index f3441d2..86e04b7 100644 --- a/lib/ui/user/user_page.dart +++ b/lib/ui/user/user_page.dart @@ -24,6 +24,7 @@ import '../../utils/hive_store.dart'; import '../../utils/toast/cloud_toast.dart'; import '../../utils/user_tool.dart'; import '../home/call.dart'; +import '../widget/appdialog.dart'; import 'content_details_page.dart'; import '../home/home_page.dart'; @@ -49,6 +50,7 @@ class _UserPageState extends State { final service = FlutterBackgroundService(); final EasyRefreshController _easyRefreshController = EasyRefreshController(); String? endDate; + @override void dispose() { _easyRefreshController.dispose(); @@ -61,28 +63,39 @@ class _UserPageState extends State { @override void initState() { super.initState(); + // showDialog(context: context, builder: (context){ + // return const AppDialog(); + // }); // _easyRefreshController.callRefresh(); // UserTool.userProvider.updateUserInfo(); // if (UserTool.userProvider.isLogin) { + // // // print(UserTool.userProvider.userInfo.end * 1000); // // print(DateTime.now().millisecondsSinceEpoch); - // if (UserTool.userProvider.userInfo.isVip != 1) { - // isVip = false; - // vle = false; - // } else { - // isVip = true; - // vle = await service.isRunning(); - // } + // // if (UserTool.userProvider.userInfo.isVip != 1) { + // // isVip = false; + // // vle = false; + // // } else { + // // isVip = true; + // // vle = await service.isRunning(); + // // } // //service.isRunning() as bool; // // endDate = DateUtil.formatDateMs( // // UserTool.userProvider.userInfo.end * 1000, // // format: DateFormats.y_mo_d); - // } else { + // } + // else { // vle = false; // } - } - + // getRes() async{ + // var res=await apiClient.request(API.app.trialVip); + // if(res.code==0){ + // showDialog(context: context, builder: (context){ + // return const AppDialog(); + // }); + // } + // } @override Widget build(BuildContext context) { @@ -105,8 +118,15 @@ class _UserPageState extends State { _getRequests(); // await UserTool.userProvider.updateUserInfo(); if (UserTool.userProvider.isLogin) { + // var res=await apiClient.request(API.app.trialVip); + if(UserTool.userProvider.userInfo.isTrial==0){ + showDialog(context: context, builder: (context){ + return const AppDialog(); + }); + } // print(UserTool.userProvider.userInfo.end * 1000); // print(DateTime.now().millisecondsSinceEpoch); + if (UserTool.userProvider.userInfo.isVip != 1) { isVip = false; vle = false; diff --git a/lib/ui/widget/appdialog.dart b/lib/ui/widget/appdialog.dart new file mode 100644 index 0000000..ef0b8c2 --- /dev/null +++ b/lib/ui/widget/appdialog.dart @@ -0,0 +1,193 @@ +import 'package:flutter/material.dart'; +import 'package:project_telephony/utils/headers.dart'; + +import '../../constants/api.dart'; +import '../../model/network/api_client.dart'; +import '../../utils/toast/cloud_toast.dart'; + +class AppDialog extends Dialog { + final String title; + final String confirm; //按钮文字 + // final String content; //内容 + // final bool? showCancel; + // final OnDialogClickListener? clickListener; + + const AppDialog( // this.showCancel, + // this.clickListener, + { + Key? key, + this.title = "恭喜您获得会员体验卡", + this.confirm = "立即领取", + // this.content = "内容", + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + margin: EdgeInsets.symmetric(horizontal: 95.w,vertical: 452.w), + decoration: BoxDecoration( + image: + DecorationImage(image: AssetImage(Assets.images.bouncedbg.path))), + child: Column( + children: [ + 32.hb, + Text( + title, + style: TextStyle( + fontSize: 36.sp, + ), + ), + 80.hb, + _getVip(), + 218.hb, + Row( + children: [ + 72.wb, + _getText("接听发送"), + 64.wb, + _getText("拒接发送"), + 64.wb, + _getText("提升形象"), + ], + ), + 50.hb, + _getBotton(confirm, context), + ], + ), + ); +/**/ + // + // Stack( + // children: [ + // Align( + // child: Image.asset( + // Assets.images.bouncedbg.path, + // width: 560.w, + // height: 720.w, + // fit: BoxFit.fill, + // ), + // ), + // Positioned( + // top: 64.w, + // left: 100.w, + // child: Text( + // title, + // style: TextStyle( + // fontSize: 36.sp, + // ), + // )), + // Positioned(top: 108.w, left: 96.w, child: _getVip()), + // Positioned( + // child: Row( + // children: [ + // _getText("接听发送"), + // 64.wb, + // _getText("拒接发送"), + // 64.wb, + // _getText("提升形象"), + // ], + // )), + // Positioned(child: _getBotton(confirm, context)), + // ], + // ); + } +} + +_getBotton(String bContent, context) { + return GestureDetector( + onTap: () async{ + var res=await apiClient.request(API.app.trialVip); + if(res.code==0){ + // showDialog(context: context, builder: (context){ + // return const AppDialog(); + // }); + CloudToast.show(res.msg); + // BoxShadow.show(res.msg); + }else{ + CloudToast.show(res.msg); + Navigator.pop(context); + } + }, + child: Container( + margin: EdgeInsets.symmetric(horizontal: 64.w), + padding: EdgeInsets.symmetric(horizontal: 155.w,vertical: 28.w), + height: 88.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12.w), + gradient: const LinearGradient( + colors: [Color(0xFFFFEAB0), Color(0xFFFFF6D8)], + end: Alignment.centerLeft, + begin: Alignment.centerRight)), + child: Text( + bContent, + style: TextStyle(fontSize: 28.sp,fontWeight:FontWeight.bold), + ), + ), + ); +} + +_getText(String content) { + return Text( + content, + style: TextStyle(color: const Color(0xFF1890FF), fontSize: 24.w), + ); +} + +_getVip() { + return SizedBox( + width: 370.w, + height: 100.w, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text.rich(TextSpan(children: [ + TextSpan( + text: "03", + style: TextStyle( + color: const Color(0xFFFFEAB0), + fontSize: 56.sp, + fontFamily: "BlackItalic", + fontWeight: FontWeight.bold)), + TextSpan( + text: "天", + style: TextStyle( + color: const Color(0xFFFFEAB0), + fontSize: 24.sp, + // height: 1.0, + )) + ])), + const Spacer(), + Column( + children: [ + Text( + "VIP", + style: TextStyle( + color: const Color(0xFFE7F3FF), + fontSize: 32.sp, + fontFamily: "BlackItalic", + fontWeight: FontWeight.bold), + ) + ], + ) + ], + ), + Text( + "短信帮手会员体验卡", + style: TextStyle( + color: const Color(0xFFFFEAB0), + fontSize: 24.sp, + ), + ) + ], + ), + ); +} + +// abstract class OnDialogClickListener { +// void onConfirm(); +// +// void onCancel(); +// } diff --git a/pubspec.yaml b/pubspec.yaml index 8f502b4..a050301 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -93,6 +93,7 @@ dependencies: url_launcher: ^6.1.5 #tabBar样式切换 tab_indicator_styler: ^2.0.0 + # # jdk # jverify: ^2.2.5 ## pub 集成