austin_dai
/
project_telephony
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

Browse Source 
# Conflicts:
#	lib/providers/user_provider.dart
#	lib/ui/home/answer_idle.dart
#	lib/ui/home/func/contant_func.dart
master
王亚玲 2 years ago
parent 688a7933e5 30fa9d8b57
commit fe119a74ec
8 changed files with 236 additions and 224 deletions
Show Stats Download Patch File Download Diff File

46
lib/providers/user_provider.dart
Unescape View File

@ -121,6 +121,52 @@ class UserProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future updateSms() async {
final prefs = await SharedPreferences.getInstance();
final service = FlutterBackgroundService();
var base = await apiClient.request(API.content.find, data: {'status': 2});
if (base.code == 0) {
await prefs.remove('refSms');
await prefs.setString(
'refSms',
(UserTool.userProvider.userInfo.tag) == ""
? "${base.data['content']}"
: "【${UserTool.userProvider.userInfo.tag}】${base.data['content']}");
service.invoke("stopService");
if (prefs.getBool('kg')!) {
Future.delayed(const Duration(seconds: 1), () async {
service.startService();
});
}
} else {
CloudToast.show(base.msg);
}
notifyListeners();
}
Future updateIdleSms() async {
final prefs = await SharedPreferences.getInstance();
final service = FlutterBackgroundService();
var base = await apiClient.request(API.content.find, data: {'status': 2});
if (base.code == 0) {
await prefs.remove('refSms');
await prefs.setString(
'refSms',
(UserTool.userProvider.userInfo.tag) == ""
? "${base.data['content']}"
: "【${UserTool.userProvider.userInfo.tag}】${base.data['content']}");
service.invoke("stopService");
if (prefs.getBool('kg')!) {
Future.delayed(const Duration(seconds: 1), () async {
service.startService();
});
}
} else {
CloudToast.show(base.msg);
}
notifyListeners();
}
Future getExclude() async { Future getExclude() async {
final prefs = await SharedPreferences.getInstance(); final prefs = await SharedPreferences.getInstance();
final service = FlutterBackgroundService(); final service = FlutterBackgroundService();

54
lib/ui/home/answer_idle.dart
Unescape View File

@ -2,8 +2,6 @@ import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:project_telephony/ui/home/func/contant_func.dart';
import 'package:project_telephony/ui/widget/plone_bottom.dart';
import 'package:project_telephony/utils/headers.dart'; import 'package:project_telephony/utils/headers.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -23,13 +21,8 @@ class AnswerIdleList extends StatefulWidget {
final bool isIdle; final bool isIdle;
final int num; final int num;
// final List contant;
const AnswerIdleList( const AnswerIdleList(
{Key? key, {Key? key, required this.refreshController, required this.isIdle,required this.num})
required this.refreshController,
required this.isIdle,
required this.num})
: super(key: key); : super(key: key);
@override @override
@ -47,7 +40,6 @@ class _AnswerIdleListState extends State<AnswerIdleList>
int isCheck = 0; int isCheck = 0;
bool val = false; bool val = false;
// final EasyRefreshController _easyRefreshController = EasyRefreshController(); // final EasyRefreshController _easyRefreshController = EasyRefreshController();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -66,12 +58,10 @@ class _AnswerIdleListState extends State<AnswerIdleList>
header: MaterialHeader(), header: MaterialHeader(),
// footer: MaterialFooter(), // footer: MaterialFooter(),
onRefresh: () async { onRefresh: () async {
// await userProvider.updateUserInfo(); await userProvider.updateUserInfo();
// answerList = print("这是数据$answerList");
// await ContantFunc.getFindByStatus(widget.num); // userProvider.updateRefSms();
// print("这是数据$answerList"); // updateList();
// // userProvider.updateRefSms();
updateList();
setState(() {}); setState(() {});
}, },
slivers: [ slivers: [
@ -92,8 +82,6 @@ class _AnswerIdleListState extends State<AnswerIdleList>
// footer: MaterialFooter(), // footer: MaterialFooter(),
onRefresh: () async { onRefresh: () async {
await userProvider.updateUserInfo(); await userProvider.updateUserInfo();
answerList =
await ContantFunc.getFindByStatus(widget.num);
print("这是数据$answerList"); print("这是数据$answerList");
// userProvider.updateRefSms(); // userProvider.updateRefSms();
// updateList(); // updateList();
@ -101,27 +89,11 @@ class _AnswerIdleListState extends State<AnswerIdleList>
}, },
slivers: [ slivers: [
SliverList( SliverList(
delegate: SliverChildBuilderDelegate((context, index) { delegate:
SliverChildBuilderDelegate((context, index) {
return _getBox(answerList[index], index); return _getBox(answerList[index], index);
}, childCount: answerList.length)) }, childCount: answerList.length))
])), ]))
PloneBottom(onTap: () {
if (userProvider.userInfo.isVip == 1) {
if (answerList.length > 5) {
BotToast.showText(text: '自定义数量已达上限，请先删除不需要的短信');
} else {
Get.to(AddSmsPage(
status: 1,
ploneBack: (String textContent) {
widget.refreshController.callRefresh();
},
));
}
} else {
BotToast.showText(text: '请先开通会员');
}
setState(() {});
}),
], ],
); );
} }
@ -132,8 +104,7 @@ class _AnswerIdleListState extends State<AnswerIdleList>
// smsIdList.clear(); // smsIdList.clear();
int i = 0; int i = 0;
// contentRef // contentRef
var base = await apiClient var base = await apiClient.request(API.content.findByStatus, data: {'status': 1});
.request(API.content.findByStatus, data: {'status': 1});
if (base.code == 0) { if (base.code == 0) {
_model=(base.data as List) _model=(base.data as List)
.map((e) => SmsContentModel.fromJson(e)) .map((e) => SmsContentModel.fromJson(e))
@ -166,7 +137,8 @@ class _AnswerIdleListState extends State<AnswerIdleList>
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 36.sp), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 36.sp),
), ),
subtitle: Text( subtitle: Text(
widget.isIdle ? "您给朋友去电接听后所发送的短信" : "朋友给你来电接听后所发送的短信", widget.isIdle
? "您给朋友去电接听后所发送的短信":"朋友给你来电接听后所发送的短信",
style: TextStyle(color: const Color(0xFF999999), fontSize: 28.sp), style: TextStyle(color: const Color(0xFF999999), fontSize: 28.sp),
), ),
trailing: widget.isIdle trailing: widget.isIdle
@ -190,8 +162,8 @@ class _AnswerIdleListState extends State<AnswerIdleList>
return GestureDetector( return GestureDetector(
onTap: () async { onTap: () async {
if (item.content != "自定义短信内容") { if (item.content != "自定义短信内容") {
BaseModel res = await apiClient BaseModel res = await apiClient.request(API.content.checked,
.request(API.content.checked, data: {'id': item.id, 'status': 1}); data: {'id': item.id, 'status': 1});
if (res.code == 0) { if (res.code == 0) {
setState(() {}); setState(() {});
userProvider.updateUserInfo(); userProvider.updateUserInfo();

68
lib/ui/home/calling_idle_list.dart
Unescape View File

@ -54,6 +54,34 @@ class _CallingIdleListState extends State<CallingIdleList>
updateList(); updateList();
} }
Future<void> updateList() async {
if (userProvider.isLogin) {
textListSMS.clear();
smsIdList.clear();
int i = 0;
var base = await apiClient
.request(API.content.findByStatus, data: {'status': widget.status});
if (base.code == 0) {
_model = (base.data as List)
.map((e) => SmsContentModel.fromJson(e))
.toList();
} else {
CloudToast.show(base.msg);
}
for (var model in _model) {
textListSMS.add(model.content);
smsIdList.add(model.id);
if (model.isChecked == 1) {
isCheck = i;
}
i++;
}
textListSMS.add("自定义短信内容");
} else {
textListSMS = textList;
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Column(
@ -110,34 +138,6 @@ class _CallingIdleListState extends State<CallingIdleList>
); );
} }
updateList() async {
if (userProvider.isLogin) {
textListSMS.clear();
smsIdList.clear();
int i = 0;
var base = await apiClient
.request(API.content.findByStatus, data: {'status': widget.status});
if (base.code == 0) {
_model = (base.data as List)
.map((e) => SmsContentModel.fromJson(e))
.toList();
} else {
CloudToast.show(base.msg);
}
for (var model in _model) {
textListSMS.add(model.content);
smsIdList.add(model.id);
if (model.isChecked == 1) {
isCheck = i;
}
i++;
}
textListSMS.add("自定义短信内容");
} else {
textListSMS = textList;
}
}
_getText() { _getText() {
return Container( return Container(
height: 128.w, height: 128.w,
@ -182,12 +182,14 @@ class _CallingIdleListState extends State<CallingIdleList>
if (textListSMS.length > 5) { if (textListSMS.length > 5) {
BotToast.showText(text: '自定义数量已达上限，请先删除不需要的短信'); BotToast.showText(text: '自定义数量已达上限，请先删除不需要的短信');
} else { } else {
Get.to(AddSmsPage( Get.to(
status: 2, AddSmsPage(
status: widget.status,
ploneBack: (String textContent) { ploneBack: (String textContent) {
widget.refreshController.callRefresh(); widget.refreshController.callRefresh();
}, },
)); ),
);
} }
} else { } else {
BotToast.showText(text: '请先开通会员'); BotToast.showText(text: '请先开通会员');
@ -232,7 +234,9 @@ class _CallingIdleListState extends State<CallingIdleList>
end: Alignment.centerRight, end: Alignment.centerRight,
colors: [ colors: [
index == isCheck ? widget.themeColor : const Color(0xFFF9F9F9), index == isCheck ? widget.themeColor : const Color(0xFFF9F9F9),
index == isCheck ? widget.themeColor : const Color(0xFFF9F9F9), index == isCheck
? widget.themeColor.withOpacity(0.5)
: const Color(0xFFF9F9F9),
]), ]),
), ),
child: Text( child: Text(

71
lib/ui/home/content_connect_page.dart
Unescape View File

@ -1,15 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:project_telephony/base/base_style.dart'; import 'package:project_telephony/base/base_style.dart';
import 'package:project_telephony/ui/home/calling_idle_list.dart';
import 'package:project_telephony/ui/widget/plone_back_button.dart'; import 'package:project_telephony/ui/widget/plone_back_button.dart';
import 'package:project_telephony/utils/headers.dart'; import 'package:project_telephony/utils/headers.dart';
import 'package:tab_indicator_styler/tab_indicator_styler.dart'; import 'package:tab_indicator_styler/tab_indicator_styler.dart';
import 'answer_idle.dart';
class ContentConnectPage extends StatefulWidget { class ContentConnectPage extends StatefulWidget {
const ContentConnectPage({Key? key}) : super(key: key); const ContentConnectPage({Key? key}) : super(key: key);
@ -24,12 +22,14 @@ class _ContentConnectPageState extends State<ContentConnectPage>
EasyRefreshController(); EasyRefreshController();
final EasyRefreshController _wasAnswerRefreshController = final EasyRefreshController _wasAnswerRefreshController =
EasyRefreshController(); EasyRefreshController();
int state=1;
@override @override
void initState() { void initState() {
_tabController = TabController(length: 2, initialIndex: 0, vsync: this); _tabController = TabController(
length: 2,
initialIndex: 0,
vsync: this,
);
super.initState(); super.initState();
} }
@ -62,20 +62,20 @@ class _ContentConnectPageState extends State<ContentConnectPage>
height: 88.w, height: 88.w,
margin: EdgeInsets.symmetric(horizontal: 66.w), margin: EdgeInsets.symmetric(horizontal: 66.w),
padding: EdgeInsets.all(8.w), padding: EdgeInsets.all(8.w),
decoration:BoxDecoration(color: const Color(0xFFF9F9F9),borderRadius: BorderRadius.all(Radius.circular(44.w))), decoration: BoxDecoration(
color: const Color(0xFFF9F9F9),
borderRadius: BorderRadius.all(Radius.circular(44.w))),
child: TabBar( child: TabBar(
// indicator: Decoration(),
controller: _tabController, controller: _tabController,
labelColor: const Color(0xFF1890FF), labelColor: const Color(0xFF1890FF),
unselectedLabelColor: const Color(0xFF999999), unselectedLabelColor: const Color(0xFF999999),
unselectedLabelStyle:const TextStyle(fontWeight:FontWeight.bold), unselectedLabelStyle:
const TextStyle(fontWeight: FontWeight.bold),
labelStyle: const TextStyle(fontWeight: FontWeight.bold), labelStyle: const TextStyle(fontWeight: FontWeight.bold),
onTap: (num) { onTap: (num) {
if (num == 0) { if (num == 0) {
state=1;
_answerRefreshController.callRefresh(); _answerRefreshController.callRefresh();
} else { } else {
state=3;
_wasAnswerRefreshController.callRefresh(); _wasAnswerRefreshController.callRefresh();
} }
}, },
@ -87,32 +87,39 @@ class _ContentConnectPageState extends State<ContentConnectPage>
topRightRadius: 44.w, topRightRadius: 44.w,
// paintingStyle: PaintingStyle.fill, // paintingStyle: PaintingStyle.fill,
), ),
// indicatorSize: TabBarIndicatorSize.label,
// isScrollable: true,
tabs: const [ tabs: const [
// _tab(0, "被叫接听"),_tab(1, "主叫接听"), Tab(
Tab(text: "被叫接听",),Tab(text: "主叫接听",) text: "被叫接听",
),
]), Tab(
text: "主叫接听",
),
],
),
), ),
Expanded( Expanded(
child: TabBarView(controller: _tabController, children: [ child: TabBarView(
// _getBox(), controller: _tabController,
AnswerIdleList( children: [
// contant: const [], CallingIdleList(
num: state, refreshController: _answerRefreshController,
refreshController: _answerRefreshController, isIdle: false, title: '朋友给你来电接听后所发送的短信',
status: 1,
themeColor: const Color(0xFF1890FF),
),
CallingIdleList(
refreshController: _answerRefreshController,
isIdle: true,
title: '您给朋友去电接听后所发送的短信',
status: 3,
themeColor: const Color(0xFF1890FF),
), ),
AnswerIdleList(
// contant: const [],
num: state,
refreshController: _wasAnswerRefreshController, isIdle: true,
)
]))
], ],
)); ),
),
],
),
);
} }
@override @override

20
lib/ui/home/func/contant_func.dart
Unescape View File

@ -1,20 +0,0 @@
import 'package:project_telephony/constants/api.dart';
import 'package:project_telephony/model/contant_list_model.dart';
import 'package:project_telephony/model/network/api_client.dart';
import 'package:project_telephony/utils/inner_model/base_list_model.dart';
import '../../../utils/toast/cloud_toast.dart';
class ContantFunc {
static Future<List<ContantListModel>> getFindByStatus(int status) async {
BaseListModel res =
await apiClient.requestList(API.content.findByStatus, data:{'status': status});
if(res.code!=0) {
CloudToast.show(res.msg);
return [];
}else{
return res.nullSafetyList.map((e) => ContantListModel.fromJson(e)).toList();
}
}
}

1
lib/ui/user/content_details_page.dart
Unescape View File

@ -112,7 +112,6 @@ final FocusNode verifyNode=FocusNode();
widget.ploneBack(_controller.text); widget.ploneBack(_controller.text);
UserTool.userProvider.updateUserInfo(); UserTool.userProvider.updateUserInfo();
UserTool.userProvider.updateConSms(); UserTool.userProvider.updateConSms();
UserTool.userProvider.updateRefSms();
Get.back(); Get.back();
} else { } else {
CloudToast.show(res.msg); CloudToast.show(res.msg);

2
lib/ui/user/user_page.dart
Unescape View File

@ -119,7 +119,7 @@ class _UserPageState extends State<UserPage> {
// await UserTool.userProvider.updateUserInfo(); // await UserTool.userProvider.updateUserInfo();
if (UserTool.userProvider.isLogin) { if (UserTool.userProvider.isLogin) {
// var res=await apiClient.request(API.app.trialVip); // var res=await apiClient.request(API.app.trialVip);
if(UserTool.userProvider.userInfo.isTrial==0){ if(UserTool.userProvider.userInfo.isTrial!=0){
showDialog(context: context, builder: (context){ showDialog(context: context, builder: (context){
return const AppDialog(); return const AppDialog();
}); });

8
lib/ui/widget/appdialog.dart
Unescape View File

@ -24,10 +24,14 @@ class AppDialog extends Dialog {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 95.w,vertical: 452.w),
margin:EdgeInsets.only(left: 95.w,top: 452.w),
// EdgeInsets.symmetric(horizontal: 95.w,vertical: 452.w),
decoration: BoxDecoration( decoration: BoxDecoration(
image: image:
DecorationImage(image: AssetImage(Assets.images.bouncedbg.path))), DecorationImage(image: AssetImage(Assets.images.bouncedbg.path,))),
child: Column( child: Column(
children: [ children: [
32.hb, 32.hb,

Write Preview
Loading…
Cancel
Save