From e97d78fe9910eef6e78f3d3544d2feab6cc14ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Wed, 7 Aug 2024 18:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=9F=E9=94=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../register/starLock_register_xhj_page.dart  | 58 ++++++++++---------
 .../massSendElectronicKeyManage_page.dart     |  1 -
 .../massSendReceiverCell.dart                 |  6 +-
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/lib/login/register/starLock_register_xhj_page.dart b/lib/login/register/starLock_register_xhj_page.dart
index 39f8631c..f2234e69 100755
--- a/lib/login/register/starLock_register_xhj_page.dart
+++ b/lib/login/register/starLock_register_xhj_page.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -79,7 +78,8 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
               onTap: (int index) {
                 state.isIphoneType.value = index == 0;
               },
-              overlayColor: MaterialStateProperty.resolveWith((Set<MaterialState> states) {
+              overlayColor: MaterialStateProperty.resolveWith(
+                  (Set<MaterialState> states) {
                 return Colors.transparent;
               }),
               dividerHeight: 0,
@@ -113,24 +113,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
           child: Obx(() => Container(
                 color: Colors.white,
                 height: 70.h,
-                child: Row(
-                  children: <Widget>[
-                    SizedBox(width: 5.w),
-                    Text(TranslationLoader.lanKeys!.countryAndRegion!.tr,
-                        style: TextStyle(
-                            fontSize: 26.sp, color: AppColors.blackColor)),
-                    SizedBox(width: 50.w),
-                    Text(
-                      state.isIphoneType.value
-                          ? '${state.countryName.value} +${state.countryCode.value}'
-                          : state.countryName.value,
-                      style: TextStyle(
-                          fontSize: 26.sp, color: AppColors.mainColor),
-                    ),
-                  ],
-                ),
+                child: Visibility(
+                    visible: state.isIphoneType.value,
+                    child: Row(
+                      children: <Widget>[
+                        SizedBox(width: 5.w),
+                        Text(TranslationLoader.lanKeys!.countryAndRegion!.tr,
+                            style: TextStyle(
+                                fontSize: 26.sp, color: AppColors.blackColor)),
+                        SizedBox(width: 50.w),
+                        Text(
+                          state.isIphoneType.value
+                              ? '${state.countryName.value} +${state.countryCode.value}'
+                              : state.countryName.value,
+                          style: TextStyle(
+                              fontSize: 26.sp, color: AppColors.mainColor),
+                        ),
+                      ],
+                    )),
               )),
-        ),
+        )
       ],
     );
   }
@@ -270,10 +272,11 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
                             style: TextStyle(
                                 color: AppColors.mainColor, fontSize: 20.sp)),
                         onTap: () {
-                          Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                            'url': XSConstantMacro.userAgreementURL,
-                            'title': '用户协议'.tr
-                          });
+                          Get.toNamed(Routers.webviewShowPage,
+                              arguments: <String, String>{
+                                'url': XSConstantMacro.userAgreementURL,
+                                'title': '用户协议'.tr
+                              });
                         },
                       )),
                   WidgetSpan(
@@ -284,10 +287,11 @@ class _StarLockRegisterPageState extends State<StarLockRegisterXHJPage> {
                             style: TextStyle(
                                 color: AppColors.mainColor, fontSize: 20.sp)),
                         onTap: () {
-                          Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                            'url': XSConstantMacro.privacyPolicyURL,
-                            'title': '隐私政策'.tr
-                          });
+                          Get.toNamed(Routers.webviewShowPage,
+                              arguments: <String, String>{
+                                'url': XSConstantMacro.privacyPolicyURL,
+                                'title': '隐私政策'.tr
+                              });
                         },
                       )),
                 ],
diff --git a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicManageKey/massSendElectronicKeyManage_page.dart b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicManageKey/massSendElectronicKeyManage_page.dart
index 35218912..9e687ddf 100755
--- a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicManageKey/massSendElectronicKeyManage_page.dart
+++ b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicManageKey/massSendElectronicKeyManage_page.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import '../../../../../../app_settings/app_colors.dart';
 import '../../../../../../tools/titleAppBar.dart';
-import '../../../../../../translations/trans_lib.dart';
 import 'massSendElectronicKeyManage_tabbar.dart';
 
 class MassSendElectronicKeyManagePage extends StatefulWidget {
diff --git a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart
index ceadf445..c5ad733a 100755
--- a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart
+++ b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiverCell.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/lockUserList/lockUserList_entity.dart';
 import 'package:star_lock/tools/regexp_tool.dart';
-import 'package:star_lock/translations/trans_lib.dart';
 import '../../../../../../app_settings/app_colors.dart';
 
 class MassSendReceiverCell extends StatefulWidget {
@@ -207,6 +207,10 @@ class _MassSendReceiverCellState extends State<MassSendReceiverCell> {
                 border: InputBorder.none,
               ),
               onSubmitted: onSubmitted,
+              //限制输入长度
+              inputFormatters: <TextInputFormatter>[
+                LengthLimitingTextInputFormatter(50),
+              ],
             ),
           ),
           if (isContactPickerEnabled)