From 4b3a74cc584275cf78d5c685dc6d24be9bfeeb19 Mon Sep 17 00:00:00 2001
From: DaisyWu <18682150237@163.com>
Date: Mon, 26 May 2025 16:11:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E2=80=94=E5=90=84=E4=B8=AA=E7=B1=BB=E5=9E=8B=E4=B8=8B?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=80=9A=E8=AE=AF=E5=BD=95=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8F=8A?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=8F=8A?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authorizedAdmin/authorizedAdmin_page.dart | 92 +++++++++++++++----
 1 file changed, 72 insertions(+), 20 deletions(-)

diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
index b908e07a..e13c01bd 100755
--- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
+++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
@@ -257,15 +257,42 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
                   onTap: () async {
                     final Contact? currentContact =
                         await logic.state.contactPicker.selectContact();
-                    logic.state.contact = currentContact!;
-                    if (currentContact.phoneNumbers!.isNotEmpty) {
-                      logic.state.emailOrPhoneController.text = currentContact
-                          .phoneNumbers![0]
-                          .replaceAll(RegExp(r'\s+\b|\b\s'), '');
-                    }
-                    if (currentContact.fullName!.isNotEmpty) {
-                      logic.state.keyNameController.text =
-                          currentContact.fullName!;
+                    if (currentContact != null) {
+                      setState(() {
+                        logic.state.contact = currentContact;
+
+                        // 处理手机号
+                        if (currentContact.phoneNumbers != null &&
+                            currentContact.phoneNumbers!.isNotEmpty) {
+                          // 获取第一个手机号并清理格式
+                          String phoneNumber = currentContact.phoneNumbers![0];
+                          // 移除所有空格、括号、连字符等特殊字符
+                          phoneNumber =
+                              phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+                          // 如果号码以+开头，保留+号
+                          if (phoneNumber.startsWith('+')) {
+                            phoneNumber = '+' +
+                                phoneNumber
+                                    .substring(1)
+                                    .replaceAll(RegExp(r'[^\d]'), '');
+                          } else {
+                            phoneNumber =
+                                phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+                          }
+                          logic.state.emailOrPhoneController.text = phoneNumber;
+                        } else {
+                          logic.state.emailOrPhoneController.text = '';
+                        }
+
+                        // 处理姓名
+                        if (currentContact.fullName != null &&
+                            currentContact.fullName!.isNotEmpty) {
+                          logic.state.keyNameController.text =
+                              currentContact.fullName!;
+                        } else {
+                          logic.state.keyNameController.text = '';
+                        }
+                      });
                     }
                   },
                 ),
@@ -602,17 +629,42 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
                 onTap: () async {
                   final Contact? currentContact =
                       await state.contactPicker.selectContact();
-                  setState(() {
-                    state.contact = currentContact!;
-                    if (currentContact.phoneNumbers!.isNotEmpty) {
-                      state.emailOrPhoneController.text = currentContact
-                          .phoneNumbers![0]
-                          .replaceAll(RegExp(r'\s+\b|\b\s'), '');
-                    }
-                    if (currentContact.fullName!.isNotEmpty) {
-                      state.keyNameController.text = currentContact.fullName!;
-                    }
-                  });
+                  if (currentContact != null) {
+                    setState(() {
+                      state.contact = currentContact;
+
+                      // 处理手机号
+                      if (currentContact.phoneNumbers != null &&
+                          currentContact.phoneNumbers!.isNotEmpty) {
+                        // 获取第一个手机号并清理格式
+                        String phoneNumber = currentContact.phoneNumbers![0];
+                        // 移除所有空格、括号、连字符等特殊字符
+                        phoneNumber =
+                            phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+                        // 如果号码以+开头，保留+号
+                        if (phoneNumber.startsWith('+')) {
+                          phoneNumber = '+' +
+                              phoneNumber
+                                  .substring(1)
+                                  .replaceAll(RegExp(r'[^\d]'), '');
+                        } else {
+                          phoneNumber =
+                              phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+                        }
+                        state.emailOrPhoneController.text = phoneNumber;
+                      } else {
+                        state.emailOrPhoneController.text = '';
+                      }
+
+                      // 处理姓名
+                      if (currentContact.fullName != null &&
+                          currentContact.fullName!.isNotEmpty) {
+                        state.keyNameController.text = currentContact.fullName!;
+                      } else {
+                        state.keyNameController.text = '';
+                      }
+                    });
+                  }
                 },
               ),
             )