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

# Conflicts:
#	lib/model/exclude_phone_model.dart
#	lib/model/exclude_phone_model.g.dart

lib/ui/home/set/specify_phone_page.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@@ -15,7 +14,6 @@ import '../../../base/base_style.dart';
 
 import '../../../model/exclude_phone_model.dart';
 
-
 import '../../widget/scaffold_theme_widget.dart';
 import 'func/exclude_contacts_func.dart';
 
@@ -28,9 +26,7 @@ class SpecifyPhonePage extends StatefulWidget {
 
 class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
   final EasyRefreshController _refreshController = EasyRefreshController();
-  List<ExcludePhoneModel> findList = [
-
-  ];
+  List<ExcludePhoneModel> findList = [];
 
   @override
   void dispose() {
@@ -73,21 +69,23 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                           // Get.to(() => const CallRecordsList());
                         }),
                         _getAddPhone("通迅录添加", "通过本机通讯录添加号码", () async {
-                          if(await Permission.contacts.isDenied){
+                          if (await Permission.contacts.isDenied) {
                             showDialog(
                                 context: context,
                                 builder: (context) {
                                   return AlertDialog(
                                     content: const Text('获取通讯录权限还未开启'),
                                     actions: [
-                                      ElevatedButton(onPressed: (){
+                                      ElevatedButton(
+                                        onPressed: () {
                                           openAppSettings();
                                         },
-                                        child: const Text("前往开启"),),
+                                        child: const Text("前往开启"),
+                                      ),
                                     ],
                                   );
                                 });
-                          }else{
+                          } else {
                             Get.to(() => (const ExcludeContactsPage()));
                           }
                         }),
@@ -133,7 +131,6 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
 
           ),
     );
-
   }
 
   _getNum() {
@@ -173,7 +170,8 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                           ),
                           24.hb,
                           CupertinoTextField(
-                            padding: EdgeInsets.symmetric(horizontal: 24.w,vertical: 20.w),
+                            padding: EdgeInsets.symmetric(
+                                horizontal: 24.w, vertical: 20.w),
                             decoration: BoxDecoration(
                                 border: Border.all(color: Colors.white),
                                 // borderRadius: BorderRadius.all(
@@ -195,7 +193,8 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                           ),
                           24.hb,
                           CupertinoTextField(
-                            padding: EdgeInsets.symmetric(horizontal: 24.w,vertical: 20.w),
+                            padding: EdgeInsets.symmetric(
+                                horizontal: 24.w, vertical: 20.w),
                             decoration: BoxDecoration(
                                 border: Border.all(color: Colors.white),
                                 // borderRadius: BorderRadius.all(
@@ -208,10 +207,10 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                           82.hb,
                           // _getUpdate("爸爸", "123123123"),
                           PloneBottom(
-                              blM:false,
+                            blM: false,
                             border: true,
-                            color1:const Color(0xFF1890FF),
-                            color2:const Color(0xFF74BCFF),
+                            color1: const Color(0xFF1890FF),
+                            color2: const Color(0xFF74BCFF),
                             onTap: () {},
                             text: "保存",
                           )
@@ -222,13 +221,14 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
                 );
               });
         },
-        title: Text(item.phone,
+        title: Text(
+            item.phone,
             style: TextStyle(
                 fontSize: 32.sp,
                 color: BaseStyle.color333333,
                 fontWeight: FontWeight.bold)),
         subtitle: Text(
-          item.remark,
+          item.address,
           style: TextStyle(fontSize: 28.sp, color: BaseStyle.color999999),
         ),
         trailing: TextButton(
@@ -254,7 +254,6 @@ class _SpecifyPhonePageState extends State<SpecifyPhonePage> {
     );
   }
 
-
   _getAddPhone(String title, String text, VoidCallback widget) {
     return GestureDetector(
       onTap: widget,