lib/ui/home/set/func/exclude_contacts_func.dart

@@ -1,21 +0,0 @@
-import 'package:project_telephony/constants/api.dart';
-import 'package:project_telephony/model/network/api_client.dart';
-import 'package:project_telephony/utils/inner_model/base_list_model.dart';
-
-import '../../../../model/exclude_phone_model.dart';
-import '../../../../utils/toast/cloud_toast.dart';
-
-class ExcludeFunc {
-//  查看手机号码
-  static Future<List<ExcludePhoneModel>> getContacts() async {
-    BaseListModel res=await apiClient.requestList(API.exclude.find,);
-    if(res.code==0){
-      return res.nullSafetyList.map((e) => ExcludePhoneModel.fromJson(e)).toList();
-    }else{
-       CloudToast.show(res.msg);
-       return [];
-    }
-  }
-  //添加手机号码
-// static Future<bool>
-}

lib/ui/home/set/phone_num_list/call_records_list.dart

@@ -3,14 +3,13 @@ import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:project_telephony/base/base_style.dart';
-import 'package:project_telephony/constants/api.dart';
-import 'package:project_telephony/model/network/api_client.dart';
 import 'package:project_telephony/utils/headers.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../../../../model/phone_num_model.dart';
-import '../../../../utils/toast/cloud_toast.dart';
 import '../../../widget/scaffold_theme_widget.dart';
 
+
+
 class CallRecordsList extends StatefulWidget {
   const CallRecordsList({Key? key}) : super(key: key);
 
@@ -21,122 +20,68 @@ class CallRecordsList extends StatefulWidget {
 class _CallRecordsListState extends State<CallRecordsList> {
   List<PhoneNumModel> phoneNum = [];
   List<PhoneNumModel> phoneNum2 = [];
-  List<String> phoneNum3 = [];
   final EasyRefreshController _easyRefreshController = EasyRefreshController();
   late bool notifications;
   late bool trackHistory;
   late bool instantOrders;
   late SharedPreferences prefs;
-  List<String> numList = [];
+  List<String> numList=[];
-  // List<String> =[]
+
+
+
   @override
   void initState() {
     // getList();
     getList();
     super.initState();
-  }
 
+  }
   @override
   void dispose() {
     _easyRefreshController.dispose();
     super.dispose();
   }
-
   getList() async {
-    phoneNum.clear();
+     phoneNum.clear();
-    final Iterable<CallLogEntry> entries = await CallLog.query();
+     final Iterable<CallLogEntry> entries = await CallLog.query();
-    for (CallLogEntry entrie in entries) {
+     for (CallLogEntry entrie in entries) {
-      if (!numList.contains(entrie.number)) {
+       if(!numList.contains(entrie.number)){
-        numList.add(entrie.number!);
+         numList.add(entrie.number!);
-        phoneNum.add(PhoneNumModel(
+         phoneNum.add(PhoneNumModel(
           num: entrie.number,
           time: entrie.timestamp,
           name: entrie.name,
           state: false,
         ));
-      }
+       }
-    }
+     }
-    for(int i=0;i<phoneNum.length;i++){
-      phoneNum2.add(PhoneNumModel(
-        num: phoneNum[i].num,
-        time: phoneNum[i].time,
-        name: phoneNum[i].name,
-        state: phoneNum[i].state,
-      ));
-    }
-
-    // for (CallLogEntry entrie in entries) {
-    //   if (!numList.contains(entrie.number)) {
-    //     numList.add(entrie.number!);
-    //     phoneNum.add(PhoneNumModel(
-    //       num: entrie.number,
-    //       time: entrie.timestamp,
-    //       name: entrie.name,
-    //       state: false,
-    //     ));
-    //   }
-    // }
   }
-
   @override
   Widget build(BuildContext context) {
-    return ScaffoldThemeWidget(
+   var profileBuilder =  FutureBuilder(
-        bottom: '添加',
+        future: getList() , // a Future<String> or null
-        title: '从通话记录添加',
+        builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-        isBorder: true,
+          if(snapshot.connectionState==ConnectionState.done){
-        isOpacity: phoneNum3.isNotEmpty,
+            return ListView.builder(
-        onTap: ()  async{
+              itemBuilder: (context, index) {
-          if(phoneNum3.isEmpty){
+                return _getBox(phoneNum[index]);
-            CloudToast.show('请选择手机号');
+              },
+              itemCount: phoneNum.length,
+            );
           }else{
-            var res=await apiClient.request(API.exclude.add,data: {});
+            return const SizedBox();
-            print(phoneNum3);
-
           }
-          // _easyRefreshController.callRefresh();
+        });
-          // phoneNum3.clear();
+return    ScaffoldThemeWidget(
-        },
+    bottom: '添加',
-        child: EasyRefresh(
+    title: '从通话记录添加',
-          firstRefresh: true,
+    isBorder: true,
-          header: MaterialHeader(),
+    isOpacity: false,
-          controller: _easyRefreshController,
+    onTap: () {
-          onRefresh: () async {
+
-            getList();
+    },
-            setState(() {});
+    child:  profileBuilder
-          },
+);
-          child:
-          ListView.builder(
-            itemBuilder: (context, index) {
-              return _getBox(phoneNum2[index],phoneNum2[index].num!);
-            },
-            itemCount: phoneNum2.length,
-          ),
-        ));
-//    var profileBuilder =  FutureBuilder(
-//      // future: _incrementCounter(),
-//         future: getList() , // a Future<String> or null
-//         builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-//           if(snapshot.connectionState==ConnectionState.done){
-//             return ListView.builder(
-//               itemBuilder: (context, index) {
-//                 return _getBox(phoneNum[index]);
-//               },
-//               itemCount: phoneNum.length,
-//             );
-//           }else{
-//             return const SizedBox();
-//           }
-//         });
-// return    ScaffoldThemeWidget(
-//     bottom: '添加',
-//     title: '从通话记录添加',
-//     isBorder: true,
-//     isOpacity: false,
-//     onTap: () {
-//
-//     },
-//     child:  profileBuilder
-// );
     // Column(
     //   children: [
     //     Container(width: 750.w, height: 1000.w, child: Text("")
@@ -158,16 +103,12 @@ class _CallRecordsListState extends State<CallRecordsList> {
     // );
   }
 
-  _getBox(PhoneNumModel item, String index) {
+  _getBox(PhoneNumModel item) {
     return CheckboxListTile(
       onChanged: (bool? value) {
-        setState(() {
+        setState((){
           item.state = value!;
-          if(item.state){
+
-            phoneNum3.add(index);
-          }else{
-            phoneNum3.remove(index);
-          }
         });
       },
       value: item.state,

lib/ui/home/set/phone_set_page.dart

@@ -11,7 +11,6 @@ import '../../widget/plone_back_button.dart';
 // }
 
 class PhoneSetPage extends StatefulWidget {
-
   const PhoneSetPage({Key? key}) : super(key: key);
 
   @override

lib/ui/home/set/specify_phone_page.dart

@@ -1,21 +1,20 @@
-
+import 'package:call_log/call_log.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:project_telephony/constants/api.dart';
-import 'package:project_telephony/model/network/api_client.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:project_telephony/ui/exclude/exclude_contacts_page.dart';
 import 'package:project_telephony/ui/exclude/exclude_single_page.dart';
+import 'package:project_telephony/ui/home/home_page.dart';
 import 'package:project_telephony/ui/home/set/phone_num_list/call_records_list.dart';
 import 'package:project_telephony/utils/headers.dart';
 import 'package:project_telephony/ui/widget/plone_bottom.dart';
-import 'package:project_telephony/utils/toast/cloud_toast.dart';
-import '../../../base/base_style.dart';
 
-import '../../../model/exclude_phone_model.dart';
+import '../../../base/base_style.dart';
 
+import '../../../model/phone_num_model.dart';
 
+import '../../widget/centertipsalterwidget.dart';
 import '../../widget/scaffold_theme_widget.dart';
 
 class SpecifyPhonePage extends StatefulWidget {
@@ -27,9 +26,6 @@ class SpecifyPhonePage extends StatefulWidget {
 
 class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
   final EasyRefreshController _refreshController = EasyRefreshController();
-  List<ExcludePhoneModel> findList = [
-    const ExcludePhoneModel(id: 0, phone: '123123123123', remark: '好的')
-  ];
 
   @override
   void dispose() {
@@ -40,7 +36,7 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
   @override
   Widget build(BuildContext context) {
     return ScaffoldThemeWidget(
-      title: "指定号码",
+      title: "发送号码设置",
       bottom: '添加',
       onTap: () {
         showModalBottomSheet(
@@ -61,14 +57,13 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                         child: ListView(
                       children: [
                         _getAddPhone("通话记录添加", "通过本机通话记录添加号码", () {
-                          Navigator.of(context)
+                          Get.to(() => ScaffoldThemeWidget(
-                              .push(
+                              bottom: '添加',
-                                MaterialPageRoute(
+                              title: '从通话记录添加',
-                                    builder: (_) => const CallRecordsList()),
+                              isBorder: true,
-                              )
+                              isOpacity: false,
-                              .then((val) => _getNullList());
+                              onTap: () {},
-
+                              child: const CallRecordsList()));
-                          // Get.to(() => const CallRecordsList());
                         }),
                         _getAddPhone("通迅录添加", "通过本机通讯录添加号码", () async {
                           if(await Permission.contacts.isDenied){
@@ -118,141 +113,18 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
           header: MaterialHeader(),
           // footer: MaterialFooter(),
           onRefresh: () async {
-            // findList = await ExcludeFunc.getContacts();
             // await userProvider.updateUserInfo();
 
             setState(() {});
           },
-          child: findList.isEmpty ? _getNullList() : _getNum()
+          child: ListView(
-
+            children: [
-          // ListView(
+              _getNullList(),
-          //   children: [findList.isEmpty ? _getNullList() : _getNum()],
+            ],
-          // )
+          )),
-
-          ),
-    );
-
-  }
-
-  _getNum() {
-    return ListView.builder(
-      itemBuilder: (context, index) {
-        return _getNumContant(findList[index]);
-      },
-      itemCount: findList.length,
-    );
-  }
-
-  _getNumContant(ExcludePhoneModel item) {
-    return Container(
-      margin: EdgeInsets.symmetric(horizontal: 16.w),
-      child: ListTile(
-        onTap: () {
-          showDialog(
-              context: context,
-              builder: (context) {
-                return CupertinoAlertDialog(
-                  title: Text(
-                    "修改名称",
-                    style: TextStyle(
-                        color: BaseStyle.color333333, fontSize: 34.sp),
-                  ),
-                  content: Column(
-                    children: [
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            "名称",
-                            style: TextStyle(
-                              fontSize: 28.sp,
-                              color: BaseStyle.color999999,
-                            ),
-                          ),
-                          24.hb,
-                          CupertinoTextField(
-                            padding: EdgeInsets.symmetric(horizontal: 24.w,vertical: 20.w),
-                            decoration: BoxDecoration(
-                                border: Border.all(color: Colors.white),
-                                // borderRadius: BorderRadius.all(
-                                //   Radius.circular(4.w)
-                                // ),
-                                color: const Color(0xFFF9F9F9)),
-                            placeholderStyle:
-                                const TextStyle(color: BaseStyle.color333333),
-                            placeholder: item.remark,
-                            onChanged: (value) {},
-                          ),
-                          20.hb,
-                          Text(
-                            "号码",
-                            style: TextStyle(
-                              fontSize: 28.sp,
-                              color: BaseStyle.color999999,
-                            ),
-                          ),
-                          24.hb,
-                          CupertinoTextField(
-                            padding: EdgeInsets.symmetric(horizontal: 24.w,vertical: 20.w),
-                            decoration: BoxDecoration(
-                                border: Border.all(color: Colors.white),
-                                // borderRadius: BorderRadius.all(
-                                //   Radius.circular(4.w)
-                                // ),
-                                color: const Color(0xFFF9F9F9)),
-                            placeholder: item.phone,
-                            onChanged: (value) {},
-                          ),
-                          82.hb,
-                          // _getUpdate("爸爸", "123123123"),
-                          PloneBottom(
-                              blM:false,
-                            border: true,
-                            color1:const Color(0xFF1890FF),
-                            color2:const Color(0xFF74BCFF),
-                            onTap: () {},
-                            text: "保存",
-                          )
-                        ],
-                      ),
-                    ],
-                  ),
-                );
-              });
-        },
-        title: Text(item.phone,
-            style: TextStyle(
-                fontSize: 32.sp,
-                color: BaseStyle.color333333,
-                fontWeight: FontWeight.bold)),
-        subtitle: Text(
-          item.remark,
-          style: TextStyle(fontSize: 28.sp, color: BaseStyle.color999999),
-        ),
-        trailing: TextButton(
-          style: ButtonStyle(
-              side: MaterialStateProperty.all(
-                  BorderSide(width: 2.w, color: const Color(0xFFE8E8E8)))),
-          onPressed: () async {
-            var res =
-                await apiClient.request(API.exclude.find, data: {item.id});
-            if (res.code == 0) {
-              _refreshController.callRefresh();
-              CloudToast.show(res.msg);
-            } else {
-              CloudToast.show(res.msg);
-            }
-          },
-          child: Text(
-            "删除",
-            style: TextStyle(fontSize: 28.sp, color: BaseStyle.color333333),
-          ),
-        ),
-      ),
     );
   }
 
-
   _getAddPhone(String title, String text, VoidCallback widget) {
     return GestureDetector(
       onTap: widget,

lib/ui/widget/appdialog.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:project_telephony/base/base_style.dart';
-import 'package:project_telephony/ui/widget/plone_bottom.dart';
 import 'package:project_telephony/utils/headers.dart';
 import 'package:project_telephony/utils/user_tool.dart';
 
@@ -77,6 +74,7 @@ _getBotton(String bContent, context) {
         CloudToast.show(res.msg);
       }
     },
+
     child: Container(
       margin: EdgeInsets.symmetric(horizontal: 64.w),
       width: 500.w,
@@ -162,107 +160,3 @@ _getVip() {
     ),
   );
 }
-
-// class FindDialog extends  StatefulWidget{
-//   final String title;
-//
-//   // final Widget widget;
-//   final VoidCallback ontap;
-//   final String name;
-//   final String phone;
-//
-//   const FindDialog(
-//       {Key? key,
-//       required this.title,
-//       required this.ontap,
-//       // required this.widget,
-//       required this.name,
-//       required this.phone})
-//       : super(key: key);
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       body:Container(
-//         margin: EdgeInsets.only(
-//           left: 100.w,
-//           right: 100.w,
-//         ),
-//         height: 720.w,
-//         child: Column(
-//           mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
-//             Text(
-//               title,
-//               style: TextStyle(
-//                 fontSize: 36.sp,
-//               ),
-//             ),
-//             _getUpdate(name, phone),
-//             PloneBottom(
-//               onTap: ontap,
-//               text: "保存",
-//             )
-//           ],
-//         ),
-//       ),
-//     );
-//   }
-//
-//   _getUpdate(String name, String phone) {
-//     return Container(
-//       height: 400.w,
-//       padding: EdgeInsets.zero,
-//       child: Column(
-//         children: [
-//           Text(
-//             "名称",
-//             style: TextStyle(
-//               fontSize: 28.sp,
-//               color: BaseStyle.color999999,
-//             ),
-//           ),
-//           24.hb,
-//           SizedBox(
-//             height: 96.w,
-//             child: TextField(
-//               decoration: InputDecoration.collapsed(
-//                 hintText: name,
-//                 hintStyle:
-//                     TextStyle(fontSize: 28.sp, color: BaseStyle.color333333),
-//                 fillColor: Colors.transparent,
-//                 // contentPadding: EdgeInsets.zero,
-//               ),
-//             ),
-//           ),
-//           48.hb,
-//           Text(
-//             "名称",
-//             style: TextStyle(
-//               fontSize: 28.sp,
-//               color: BaseStyle.color999999,
-//             ),
-//           ),
-//           24.hb,
-//           SizedBox(
-//             height: 96.w,
-//             child: TextField(
-//               decoration: InputDecoration.collapsed(
-//                 hintText: phone,
-//                 hintStyle:
-//                     TextStyle(fontSize: 28.sp, color: BaseStyle.color333333),
-//                 fillColor: Colors.transparent,
-//                 // contentPadding: EdgeInsets.zero,
-//               ),
-//             ),
-//           )
-//         ],
-//       ),
-//     );
-//   }
-//
-//   @override
-//   State<StatefulWidget> createState() {
-//     throw UnimplementedError();
-//   }
-// }

lib/ui/widget/scaffold_theme_widget.dart

@@ -23,7 +23,7 @@ class ScaffoldThemeWidget extends StatefulWidget {
   final bool isBorder;
   final bool isOpacity;
   final VoidCallback onTap;
-  final int wid;
+
   const ScaffoldThemeWidget({
     Key? key,
     required this.title,
@@ -32,7 +32,6 @@ class ScaffoldThemeWidget extends StatefulWidget {
     this.isBorder = true,
     this.isOpacity = true,
     required this.onTap,
-    this.wid=162
   }) : super(key: key);
 
   @override
@@ -55,13 +54,12 @@ class _ScaffoldThemeWidgetState extends State<ScaffoldThemeWidget> {
                 color: BaseStyle.color333333,
                 fontWeight: FontWeight.bold),
           ),
-          titleSpacing: widget.wid.w,
+          titleSpacing: 162.w,
           leading: const CloudBackButton(isSpecial: true),
           backgroundColor: kForeGroundColor),
       backgroundColor: Colors.white,
       body: widget.child,
-      bottomNavigationBar:
+      bottomNavigationBar: PloneBottom(
-      PloneBottom(
         onTap: widget.onTap,
         border: widget.isBorder,
         opacity: widget.isOpacity ? 1 : 0.4,