From 6041290ebd659feeb4f9f159c33db8893d516ef0 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Mon, 8 Jul 2024 15:33:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BC=80=E9=94=81?=
 =?UTF-8?q?=E9=A1=B5-=E8=80=83=E5=8B=A4-=E8=AE=BE=E7=BD=AE-=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=20=20=E5=88=A0=E9=99=A4=E5=90=8E=E7=82=B9=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E6=89=93=E5=8D=A1=E6=96=B9=E5=BC=8F=E5=9C=A8?=
 =?UTF-8?q?=E6=9C=89=E4=B8=8A=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA=E6=97=A0?=
 =?UTF-8?q?=E5=A4=84=E3=80=82=E4=B9=8B=E5=89=8D=E5=B7=B2=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=88=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkingInAddStaff_state.dart             |  8 ++++-
 .../lockMian/lockList/lockListGroup_view.dart | 34 +++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart
index 1a939a7a..a04a16ab 100755
--- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart
+++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_state.dart
@@ -6,7 +6,6 @@ import '../checkingInSetStaffList/checkingInStaffList_entity.dart';
 import 'checkingInAddStaffSelectKey_entity.dart';
 
 class CheckingInAddStaffState {
-
   CheckingInAddStaffState() {
     final Map<dynamic, dynamic> map = Get.arguments;
     getKeyInfosData.value = map['getKeyInfosData'];
@@ -43,8 +42,15 @@ class CheckingInAddStaffState {
       } else {
         appUnHaveAccount.value = true;
       }
+
+      if ((staffListItemData.value.cardStatus ?? 0) == 1) {
+        //打卡方式是否是正常状态
+        appUnHaveAccount.value = true;
+        attendanceWayNumber.value = '';
+      }
     }
   }
+
   final Rx<LockListInfoItemEntity> getKeyInfosData =
       LockListInfoItemEntity().obs;
   final RxString companyId = ''.obs;
diff --git a/lib/main/lockMian/lockList/lockListGroup_view.dart b/lib/main/lockMian/lockList/lockListGroup_view.dart
index 40ee97e3..258fed31 100755
--- a/lib/main/lockMian/lockList/lockListGroup_view.dart
+++ b/lib/main/lockMian/lockList/lockListGroup_view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:star_lock/flavors.dart';
 
 import '../../../app_settings/app_colors.dart';
 import '../entity/lockListInfo_entity.dart';
@@ -34,7 +35,7 @@ class _LockListGroupViewState extends State<LockListGroupView> {
   Widget build(BuildContext context) {
     return Column(
       mainAxisSize: MainAxisSize.min,
-      children: [
+      children: <Widget>[
         Container(
           color: widget.backgroundColor ?? Colors.white,
           height: 80.h,
@@ -54,23 +55,34 @@ class _LockListGroupViewState extends State<LockListGroupView> {
   }
 
   List<Widget> _buildExpandRowList() {
-    List<Widget> widgetList = [];
+    final List<Widget> widgetList = <Widget>[];
     widgetList.add(GestureDetector(
       child: Container(
         width: ScreenUtil().screenWidth,
         color: widget.backgroundColor ?? Colors.white,
         child: Row(
-          children: [
+          children: <Widget>[
             SizedBox(width: 40.w),
-            Text(
-              widget.groupItem.groupName ?? '',
-              style: widget.textStyle ??
-                  TextStyle(color: AppColors.blackColor, fontSize: 22.sp),
-            ),
-            Expanded(
-                child: SizedBox(
+            F.sw(
+                skyCall: () => Text(
+                      widget.groupItem.groupName ?? '',
+                      style: widget.textStyle ??
+                          TextStyle(
+                              color: AppColors.blackColor, fontSize: 22.sp),
+                    ),
+                xhjCall: () => Expanded(
+                      child: Text(
+                        widget.groupItem.groupName ?? '',
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                        style: widget.textStyle ??
+                            TextStyle(
+                                color: AppColors.blackColor, fontSize: 22.sp),
+                      ),
+                    )),
+            SizedBox(
               width: 10.w,
-            )),
+            ),
             AnimatedRotation(
               turns: _isExpanded ? -0.5 : 0,
               duration: _animationDuration,