Merge branch 'master' of gitee.com:starlock-cn/app-starlock

star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart

@@ -88,7 +88,7 @@ class _StarLockForgetPasswordPageState
               height: 0.5.h,
               color: Colors.grey,
             ),
-            LoginInput(
+            LoginInput().tfInput(
                 controller: state.phoneController,
                 onchangeAction: (v) {
                   logic.checkNext(state.phoneController);
@@ -107,7 +107,7 @@ class _StarLockForgetPasswordPageState
                   LengthLimitingTextInputFormatter(30),
                 ]),
             SizedBox(height: 10.h),
-            LoginInput(
+            LoginInput().tfInput(
                 controller: state.pwdController,
                 onchangeAction: (v) {
                   logic.checkNext(state.pwdController);
@@ -134,7 +134,7 @@ class _StarLockForgetPasswordPageState
                   color: AppColors.placeholderTextColor, fontSize: 20.sp),
             ),
             SizedBox(height: 10.w),
-            LoginInput(
+            LoginInput().tfInput(
                 controller: state.sureController,
                 onchangeAction: (v) {
                   logic.checkNext(state.sureController);
@@ -158,7 +158,7 @@ class _StarLockForgetPasswordPageState
             Row(
               children: [
                 Expanded(
-                  child: LoginInput(
+                  child: LoginInput().tfInput(
                       controller: state.codeController,
                       onchangeAction: (v) {
                         logic.checkNext(state.codeController);

star_lock/lib/login/login/starLock_login_page.dart

@@ -1,11 +1,8 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/flavors.dart';
-import 'package:star_lock/tools/appFirstEnterHandle.dart';
-import 'package:star_lock/tools/storage.dart';
 
 import '../../appRouters.dart';
 import '../../app_settings/app_colors.dart';
@@ -57,42 +54,34 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                     child: Image.asset('images/icon_main_1024.png',
                         width: 110.w, height: 110.w))),
             SizedBox(height: 50.w),
-            LoginInput(
+            LoginInput().tfInput(
                 controller: state.emailOrPhoneController,
                 onchangeAction: (v) {
                   logic.checkNext(state.emailOrPhoneController);
                 },
-                leftWidget: Padding(
+                leftWidget: Image.asset(
-                  padding: EdgeInsets.only(
+                  'images/icon_login_account.png',
-                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  width: 36.w,
-                  child: Image.asset(
+                  height: 36.w,
-                    'images/icon_login_account.png',
-                    width: 36.w,
-                    height: 36.w,
-                  ),
                 ),
                 hintText:
                     TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
-                keyboardType: TextInputType.number,
+                // keyboardType: TextInputType.number,
                 inputFormatters: [
                   // FilteringTextInputFormatter.allow(RegExp('[0-9]')),
                   LengthLimitingTextInputFormatter(30),
                 ]),
             SizedBox(height: 10.h),
-            LoginInput(
+            LoginInput().tfInput(
                 controller: state.pwdController,
                 onchangeAction: (v) {
                   logic.checkNext(state.pwdController);
                 },
                 isPwd: true,
-                leftWidget: Padding(
+                leftWidget: Image.asset(
-                  padding: EdgeInsets.only(
+                  'images/icon_login_password.png',
-                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  width: 36.w,
-                  child: Image.asset(
+                  height: 36.w,
-                    'images/icon_login_password.png',
-                    width: 36.w,
-                    height: 36.w,
-                  ),
                 ),
                 hintText:
                     "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",

star_lock/lib/login/login/starLock_login_state.dart

@@ -13,6 +13,9 @@ class StarLockLoginState {
 
   TextEditingController emailOrPhoneController = TextEditingController();
   TextEditingController pwdController = TextEditingController();
+  late FocusNode myFocusNode1;
+  late FocusNode myFocusNode2;
+
   StarLockLoginState() {
     // emailOrPhone.value = StoreService.to.getLastUserAccount() as String;
     emailOrPhoneController.text = emailOrPhone.value;

star_lock/lib/login/register/starLock_register_page.dart

@@ -196,7 +196,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
   Widget middleTFWidget() {
     return Column(
       children: [
-        LoginInput(
+        LoginInput().tfInput(
             controller: state.phoneOrEmailController,
             onchangeAction: (v) {
               logic.checkNext(state.phoneOrEmailController);
@@ -218,7 +218,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               LengthLimitingTextInputFormatter(30),
             ]),
         SizedBox(height: 10.w),
-        LoginInput(
+        LoginInput().tfInput(
             controller: state.pwdController,
             onchangeAction: (v) {
               logic.checkNext(state.pwdController);
@@ -244,7 +244,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp),
         ),
         SizedBox(height: 10.w),
-        LoginInput(
+        LoginInput().tfInput(
             controller: state.sureController,
             onchangeAction: (v) {
               logic.checkNext(state.sureController);
@@ -267,7 +267,7 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
         Row(
           children: [
             Expanded(
-              child: LoginInput(
+              child: LoginInput().tfInput(
                   controller: state.codeController,
                   onchangeAction: (v) {
                     logic.checkNext(state.codeController);

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart

@@ -78,8 +78,8 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
                         "keyInfo": state.keyInfo.value
                       }).then((val) {
                     if (val != null) {
-                      logic.mockNetworkDataRequest();
+                      logic.pageNo = 1;
-                      setState(() {});
+                      mockRequest();
                     }
                   });
                 },
@@ -130,6 +130,7 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
                   backgroundColor: Colors.red,
                   foregroundColor: Colors.white,
                   label: '删除',
+                  padding: EdgeInsets.only(left: 5.w, right: 5.w),
                 ),
               ],
             ),

star_lock/lib/main/lockDetail/card/addCardType/addCardType_page.dart

@@ -40,7 +40,9 @@ class _AddCardPageState extends State<AddCardPage> {
   Widget build(BuildContext context) {
     state.selectType.value = widget.selectType;
     state.lockId.value = widget.lockId;
-    state.nameController.text = widget.fromTypeTwoStaffName;
+    if(widget.fromTypeTwoStaffName.isNotEmpty){
+      state.nameController.text = widget.fromTypeTwoStaffName;
+    }
     state.fromType.value = widget.fromType;
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -75,7 +77,7 @@ class _AddCardPageState extends State<AddCardPage> {
                   TranslationLoader.lanKeys!.pleaseEnter!.tr,
                   state.nameController),
               keyTimeLimitWidget(),
-              SizedBox(height: 10.h),
+              // SizedBox(height: 10.h),
               keyBottomWidget()
             ],
           );

star_lock/lib/main/lockDetail/card/addICCard/addICCard_page.dart

@@ -1,4 +1,4 @@
-import 'package:flutter/cupertino.dart';
+ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';

star_lock/lib/main/lockDetail/card/cardList/cardList_logic.dart

@@ -340,13 +340,18 @@ class CardListLogic extends BaseGetXController {
     );
     if(entity.errorCode!.codeIsSuccessful){
       if(state.isDeletAll == false){
-        showToast("删除成功");
+        showToast("删除成功", something: (){
+          state.isDeletCardData = false;
+          pageNo = 1;
+          getICCardListData();
+        });
       }else{
-        showToast("重置成功");
+        showToast("重置成功", something: (){
+          state.isDeletCardData = false;
+          pageNo = 1;
+          getICCardListData();
+        });
       }
-
-      state.isDeletCardData = false;
-      getICCardListData();
     }
   }
 

star_lock/lib/main/lockDetail/card/cardList/cardList_page.dart

@@ -88,7 +88,8 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
             KeySearchWidget(
               editingController: state.searchController,
               onSubmittedAction: () {
-                logic.getICCardListData();
+                logic.pageNo = 1;
+                getHttpData();
               },
             ),
             SizedBox(height: 20.h),
@@ -103,7 +104,8 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
                   "fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
                 });
                 if (data != null) {
-                  logic.getICCardListData();
+                  logic.pageNo = 1;
+                  getHttpData();
                 }
               },
             ),
@@ -136,6 +138,7 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
                   backgroundColor: Colors.red,
                   foregroundColor: Colors.white,
                   label: '删除',
+                  padding: EdgeInsets.only(left: 5.w, right: 5.w),
                 ),
               ],
             ),

star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart

@@ -76,6 +76,7 @@ class _CheckingInStaffListPageState extends State<CheckingInStaffListPage> {
                         backgroundColor: Colors.red,
                         foregroundColor: Colors.white,
                         label: '删除',
+                        padding: EdgeInsets.only(left: 5.w, right: 5.w),
                       ),
                     ],
                   ),

star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart

@@ -86,7 +86,8 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
               KeySearchWidget(
                 editingController: state.searchController,
                 onSubmittedAction: () {
-                  logic.mockNetworkDataRequest();
+                  logic.pageNo = 1;
+                  mockRequest();
                 },
               ),
               SizedBox(
@@ -106,8 +107,8 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
                         "keyInfo": state.keyInfo.value
                       }).then((val) {
                     if (val != null) {
-                      logic.mockNetworkDataRequest();
+                      logic.pageNo = 1;
-                      setState(() {});
+                      mockRequest();
                     }
                   });
                 },
@@ -166,6 +167,7 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
                         backgroundColor: Colors.red,
                         foregroundColor: Colors.white,
                         label: '删除',
+                        padding: EdgeInsets.only(left: 5.w, right: 5.w),
                       ),
                     ],
                   ),

star_lock/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart

@@ -39,7 +39,9 @@ class _AddFaceTypePageState extends State<AddFaceTypePage> {
   Widget build(BuildContext context) {
     state.seletType.value = widget.selectType;
     state.lockId.value = widget.lockId;
-    state.nameController.text = widget.fromTypeTwoStaffName;
+    if(widget.fromTypeTwoStaffName.isNotEmpty){
+      state.nameController.text = widget.fromTypeTwoStaffName;
+    }
     state.fromType.value = widget.fromType;
 
     return indexChangeWidget();

star_lock/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart

@@ -40,7 +40,9 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
   Widget build(BuildContext context) {
     state.selectType.value = widget.selectType;
     state.lockId.value = widget.lockId;
-    state.nameController.text = widget.fromTypeTwoStaffName;
+    if(widget.fromTypeTwoStaffName.isNotEmpty){
+      state.nameController.text = widget.fromTypeTwoStaffName;
+    }
     state.fromType.value = widget.fromType;
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -143,10 +145,7 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
                   onConfirm: (p) {
                     state.beginTime.value =
                     '${p.year}-${p.month!.toString().padLeft(2, '0')}-${p.day!.toString().padLeft(2, '0')} ${p.hour!.toString().padLeft(2, '0')}:${p.minute!.toString().padLeft(2, '0')}';
-                    state.beginTimeTimestamp.value =
+                    state.beginTimeTimestamp.value = DateTime.parse(state.beginTime.value).millisecondsSinceEpoch.toString();
-                        DateTime.parse(state.beginTime.value)
-                            .millisecondsSinceEpoch
-                            .toString();
               });
             })),
         Obx(() => CommonItem(
@@ -156,12 +155,8 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
             action: () {
               Pickers.showDatePicker(context, mode: DateMode.YMDHM,
                   onConfirm: (p) {
-                    state.endTime.value =
+                    state.endTime.value = '${p.year}-${p.month!.toString().padLeft(2, '0')}-${p.day!.toString().padLeft(2, '0')} ${p.hour!.toString().padLeft(2, '0')}:${p.minute!.toString().padLeft(2, '0')}';
-                    '${p.year}-${p.month!.toString().padLeft(2, '0')}-${p.day!.toString().padLeft(2, '0')} ${p.hour!.toString().padLeft(2, '0')}:${p.minute!.toString().padLeft(2, '0')}';
+                    state.endTimeTimestamp.value = DateTime.parse(state.endTime.value).millisecondsSinceEpoch.toString();
-                    state.endTimeTimestamp.value =
-                        DateTime.parse(state.endTime.value)
-                            .millisecondsSinceEpoch
-                            .toString();
               });
             })),
         Container(height: 10.h),
@@ -299,7 +294,7 @@ class _AddFingerprintTypePageState extends State<AddFingerprintTypePage> {
               ],
               style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
               controller: state.nameController,
-              autofocus: false,
+              // autofocus: false,
               textAlign: TextAlign.end,
               decoration: InputDecoration(
                 //输入里面输入文字内边距设置

star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart

@@ -334,6 +334,7 @@ class FingerprintListLogic extends BaseGetXController{
 
   // 获取指纹列表
   Future<FingerprintListDataEntity> getFingerprintsListData() async{
+    // state.fingerprintItemListData.value.clear();
     FingerprintListDataEntity entity = await ApiRepository.to.getFingerprintsListData(
       lockId: state.lockId.value.toString(),
       pageNo: pageNo.toString(),
@@ -372,13 +373,18 @@ class FingerprintListLogic extends BaseGetXController{
     );
     if(entity.errorCode!.codeIsSuccessful){
       if(state.isDeletAll == false){
-        showToast("删除成功");
+        showToast("删除成功", something:(){
+          state.isDeletFingerprintData = false;
+          pageNo = 1;
+          getFingerprintsListData();
+        });
       }else{
-        showToast("重置成功");
+        showToast("重置成功", something:(){
+          state.isDeletFingerprintData = false;
+          pageNo = 1;
+          getFingerprintsListData();
+        });
       }
-
-      state.isDeletFingerprintData = false;
-      getFingerprintsListData();
     }
   }
 

star_lock/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart

@@ -68,7 +68,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
             onPressed: () async {
               var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
               if (isDemoMode == false) {
-                showDeletAlertDialog(context);
+                showDeletAlertDialog();
               } else {
                 // Get.toNamed(Routers.selectLockTypePage);
                 logic.showToast("演示模式");
@@ -90,7 +90,8 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
             KeySearchWidget(
               editingController: state.searchController,
               onSubmittedAction: () {
-                logic.getFingerprintsListData();
+                logic.pageNo = 1;
+                getHttpData();
               },
             ),
             SizedBox(
@@ -106,7 +107,8 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
                   "fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入
                 });
                 if (data != null) {
-                  logic.getFingerprintsListData();
+                  logic.pageNo = 1;
+                  getHttpData();
                 }
               },
             ),
@@ -133,11 +135,12 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
               children: [
                 SlidableAction(
                   onPressed: (BuildContext context){
-                    showIosTipViewDialog(context);
+                    showIosTipViewDialog(fingerprintItemData.fingerprintId);
                   },
                   backgroundColor: Colors.red,
-                  foregroundColor: Colors.white,
+                  // foregroundColor: Colors.white,
                   label: '删除',
+                  padding: EdgeInsets.only(left: 5.w, right: 5.w),
                 ),
               ],
             ),
@@ -156,7 +159,8 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
                         "fingerprintItemData": fingerprintItemData,
                       });
                   if (data != null) {
-                    logic.getFingerprintsListData();
+                    logic.pageNo = 1;
+                    getHttpData();
                   }
                 }),
           );
@@ -171,9 +175,9 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
         ) : NoData(noDataHeight: 1.sh - ScreenUtil().statusBarHeight - ScreenUtil().bottomBarHeight - 190.h - 64.h));
   }
 
-  void showIosTipViewDialog(BuildContext context) {
+  void showIosTipViewDialog(int? fingerprintId) {
     showDialog(
-      context: context,
+      context: Get.context!,
       builder: (BuildContext context) {
         return ShowIosTipView(
           title: "提示",
@@ -182,6 +186,7 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
             Get.back();
             state.isDeletFingerprintData = true;
             state.isDeletAll = false;
+            state.deletKeyID = fingerprintId.toString();
             state.deletUserID = (await Storage.getUid())!;
             logic.senderAddFingerprint();
           },
@@ -262,9 +267,9 @@ class _FingerprintListPageState extends State<FingerprintListPage> with RouteAwa
     );
   }
 
-  void showDeletAlertDialog(BuildContext context) {
+  void showDeletAlertDialog() {
     showCupertinoDialog(
-      context: context,
+      context: Get.context!,
       builder: (context) {
         return CupertinoAlertDialog(
           title: const Text("提示"),

star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -6,6 +6,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_entity.dart';
 
 import '../../../blue/blue_manage.dart';
@@ -20,6 +21,7 @@ import '../../../network/api_repository.dart';
 import '../../../tools/baseGetXController.dart';
 import '../../../tools/eventBusEventManage.dart';
 import '../../../tools/storage.dart';
+import '../../../translations/trans_lib.dart';
 import '../lockOperatingRecord/lockOperatingRecordGetLastRecordTime_entity.dart';
 import 'lockDetail_state.dart';
 import 'lockNetToken_entity.dart';
@@ -93,8 +95,6 @@ class LockDetailLogic extends BaseGetXController {
         getLockRecordLastUploadDataTime();
         state.openLockBtnState.value = 0;
 
-
-
         eventBus.fire(RefreshLockDetailInfoDataEvent());
         break;
       case 0x06:
@@ -651,7 +651,8 @@ class LockDetailLogic extends BaseGetXController {
         lockUserNo: state.lockUserNo.toString());
     if (entity.errorCode!.codeIsSuccessful) {
       if (state.isOpenLockNeedOnline.value == 0) {
-        state.bottomBtnisUneable.value = false;
+        state.bottomBtnisEable.value = true;
+        eventBus.fire(RefreshLockDetailInfoDataEvent());
         eventBus.fire(RefreshLockListInfoDataEvent());
         openDoorAction(1);
       } else {
@@ -725,6 +726,23 @@ class LockDetailLogic extends BaseGetXController {
     });
   }
 
+  String getKeyStatusTextAndShow(){
+    String text = "";
+    if (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitIneffective ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusFrozen ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusExpired ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusDeleted ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusReset) {
+      text = "你的钥匙${XSConstantMacro.getKeyStatusStr(state.keyInfos.value.keyStatus!)}";
+    } else {
+      text = state.isOpenPassageMode.value == 1
+          ? "常开模式启动！长按闭锁"
+          : TranslationLoader
+          .lanKeys!.clickUnlockAndHoldDownClose!.tr;
+    }
+    return text;
+  }
+
   // late StreamSubscription<List<DiscoveredDevice>>
   //     _scanListDiscoveredDeviceSubscription;
   // void _scanListDiscoveredDeviceSubscriptionAction() {

star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart

@@ -11,6 +11,7 @@ import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../blue/blue_manage.dart';
 import '../../../blue/io_tool/io_tool.dart';
+import '../../../common/XSConstantMacro/XSConstantMacro.dart';
 import '../../../tools/appRouteObserver.dart';
 import '../../../tools/dateTool.dart';
 import '../../../tools/eventBusEventManage.dart';
@@ -43,45 +44,8 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
   void initState() {
     // TODO: implement initState
     super.initState();
-    // Get.log("LockDetailPage initState1111");
+    Get.log("LockDetailPage initState1111");
 
-    state.keyInfos.value = widget.lockListInfoItemEntity;
-    state.lockUserNo = state.keyInfos.value.lockUserNo!;
-    if (state.lockUserNo == 0) {
-      state.bottomBtnisUneable.value = true;
-    }
-    state.isOnlyOneData = widget.isOnlyOneData;
-    // print("state.lockUserNo==${state.lockUserNo}");
-    state.senderUserId = state.keyInfos.value.senderUserId!;
-    state.isAttendance.value = state.keyInfos.value.lockSetting!.attendance!;
-    state.isOpenLockNeedOnline.value =
-        state.keyInfos.value.lockSetting!.appUnlockOnline!;
-    state.electricQuantity.value = state.keyInfos.value.electricQuantity!;
-    state.isOpenPassageMode.value = state.keyInfos.value.passageMode!;
-    state.lockAlias.value = state.keyInfos.value.lockAlias!;
-
-    BlueManage().connectDeviceName =
-        state.keyInfos.value.bluetooth!.bluetoothDeviceName!;
-
-    List<int> publicKeyData =
-        state.keyInfos.value.bluetooth!.publicKey!.cast<int>();
-    var saveStrList = changeIntListToStringList(publicKeyData);
-    Storage.setStringList(saveBluePublicKey, saveStrList);
-
-    // 私钥
-    List<int> privateKeyData =
-        state.keyInfos.value.bluetooth!.privateKey!.cast<int>();
-    var savePrivateKeyList = changeIntListToStringList(privateKeyData);
-    Storage.setStringList(saveBluePrivateKey, savePrivateKeyList);
-
-    // signKey
-    List<int> signKeyData =
-        state.keyInfos.value.bluetooth!.signKey!.cast<int>();
-    var saveSignKeyList = changeIntListToStringList(signKeyData);
-    Storage.setStringList(saveBlueSignKey, saveSignKeyList);
-
-    var saveTokenList = changeIntListToStringList([0, 0, 0, 0]);
-    Storage.setStringList(saveBlueToken, saveTokenList);
     // logic.startScanAction();
 
     listeningAnimations();
@@ -93,6 +57,14 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     _initRefreshLockDetailInfoDataEventAction();
   }
 
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    Get.log("LockDetailPage didChangeDependencies2222");
+    /// 路由订阅
+    AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!);
+  }
+
   StreamSubscription? _lockRefreshLockDetailInfoDataEvent;
   void _initRefreshLockDetailInfoDataEventAction() {
     // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
@@ -101,12 +73,74 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     });
   }
 
+  void loadData(){
+    // print("widget.lockListInfoItemEntity.lockUserNo:${widget.lockListInfoItemEntity.lockUserNo}");
+    // print("state.lockUserNo:${state.lockUserNo}");
+
+    state.keyInfos.value = widget.lockListInfoItemEntity;
+    state.lockUserNo = state.keyInfos.value.lockUserNo!;
+    if (state.lockUserNo == 0) {
+      state.bottomBtnisEable.value = false;
+    }else{
+      state.bottomBtnisEable.value = true;
+    }
+    // print("state.keyInfos.value.keyStatus:${state.keyInfos.value.keyStatus}");
+    if (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitIneffective ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusFrozen ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusExpired ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusDeleted ||
+        state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusReset) {
+      state.openDoorBtnisUneable.value = false;
+    }else{
+      state.openDoorBtnisUneable.value = true;
+    }
+
+    state.isOnlyOneData = widget.isOnlyOneData;
+    // print("state.lockUserNo==${state.lockUserNo}");
+    state.senderUserId = state.keyInfos.value.senderUserId!;
+    state.isAttendance.value = state.keyInfos.value.lockSetting!.attendance!;
+    state.isOpenLockNeedOnline.value =
+    state.keyInfos.value.lockSetting!.appUnlockOnline!;
+    state.electricQuantity.value = state.keyInfos.value.electricQuantity!;
+    state.isOpenPassageMode.value = state.keyInfos.value.passageMode!;
+    state.lockAlias.value = state.keyInfos.value.lockAlias!;
+
+    BlueManage().connectDeviceName =
+    state.keyInfos.value.bluetooth!.bluetoothDeviceName!;
+
+    List<int> publicKeyData =
+    state.keyInfos.value.bluetooth!.publicKey!.cast<int>();
+    var saveStrList = changeIntListToStringList(publicKeyData);
+    Storage.setStringList(saveBluePublicKey, saveStrList);
+
+    // 私钥
+    List<int> privateKeyData =
+    state.keyInfos.value.bluetooth!.privateKey!.cast<int>();
+    var savePrivateKeyList = changeIntListToStringList(privateKeyData);
+    Storage.setStringList(saveBluePrivateKey, savePrivateKeyList);
+
+    // signKey
+    List<int> signKeyData =
+    state.keyInfos.value.bluetooth!.signKey!.cast<int>();
+    var saveSignKeyList = changeIntListToStringList(signKeyData);
+    Storage.setStringList(saveBlueSignKey, saveSignKeyList);
+
+    var saveTokenList = changeIntListToStringList([0, 0, 0, 0]);
+    Storage.setStringList(saveBlueToken, saveTokenList);
+  }
+
   @override
   Widget build(BuildContext context) {
+    loadData();
+
     return ListView(
       children: [
         Visibility(
-          visible: false,
+          visible: (
+              (state.keyInfos.value.keyType == XSConstantMacro.keyTypeTime || state.keyInfos.value.keyType == XSConstantMacro.keyTypeLoop) && // 限时、循环
+              (DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) < 30  && DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!) > 0) &&// 0到30天
+              (state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusNormalUse || state.keyInfos.value.keyStatus == XSConstantMacro.keyStatusWaitReceive)// 正常使用、待接收
+          ) ? true : false,
           child: Container(
             // height: 30.h,
             color: const Color(0xFFFBEFD4),
@@ -114,7 +148,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Text("钥匙将在2天后失效",
+                Text("钥匙将在${DateTool().compareTimeGetDaysFromNow(state.keyInfos.value.endDate!)}天后失效",
                     style: TextStyle(
                         color: const Color(0xffCBA74B), fontSize: 24.sp))
               ],
@@ -259,21 +293,39 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
             children: [
               Center(
                   child: GestureDetector(
+                onTap: state.openDoorBtnisUneable.value == true ? () {
+                  // Get.log("点击开锁");
+                  setState(() {
+                    startOpenLock();
+                  });
+                } : null,
+                onLongPressStart: state.openDoorBtnisUneable.value == true ? (details) {
+                  Get.log("长按闭锁");
+                  setState(() {
+                    startUnLock();
+                  });
+                  // startUnLock();
+                }:null,
                 child: Stack(
                       children: [
                         Image.asset(
-                          // state.connectState.value == 0 ? 'images/main/icon_main_openLockBtn_grey.png' : 'images/main/icon_main_openLockBtn_center.png',
+                          state.openDoorBtnisUneable.value == false ? 'images/main/icon_main_openLockBtn_grey.png' : (state.isOpenPassageMode.value == 1
-                          state.isOpenPassageMode.value == 1
                               ? 'images/main/icon_main_normallyOpenMode_center.png'
-                              : 'images/main/icon_main_openLockBtn_center.png',
+                              : 'images/main/icon_main_openLockBtn_center.png'),
                           width: 330.w,
                           height: 330.w,
                         ),
+                        state.openDoorBtnisUneable.value == false ? Positioned(
+                          child: Image.asset(
+                            'images/main/icon_main_openLockBtn_grey.png',
+                            width: 330.w,
+                            height: 330.w,
+                          ),
+                        ) :
                         state.openLockBtnState.value == 1
                             ? buildRotationTransition()
                             : Positioned(
                                 child: Image.asset(
-                                // 'images/main/icon_main_openLockBtn_circle.png',
                                 state.isOpenPassageMode.value == 1
                                     ? 'images/main/icon_main_normallyOpenMode_circle.png'
                                     : 'images/main/icon_main_openLockBtn_circle.png',
@@ -282,19 +334,6 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
                               )),
                       ],
                     ),
-                onTap: () {
-                  // Get.log("点击开锁");
-                  setState(() {
-                    startOpenLock();
-                  });
-                },
-                onLongPressStart: (details) {
-                  Get.log("长按闭锁");
-                  setState(() {
-                    startUnLock();
-                  });
-                  // startUnLock();
-                },
               )),
             ],
           ),
@@ -321,10 +360,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Text(
-                  state.isOpenPassageMode.value == 1
+              logic.getKeyStatusTextAndShow(),
-                      ? "常开模式启动！长按闭锁"
-                      : TranslationLoader
-                          .lanKeys!.clickUnlockAndHoldDownClose!.tr,
                   style: TextStyle(
                       fontSize: 22.sp,
                       color: AppColors.btnDisableColor,
@@ -468,7 +504,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
 
     // 新增配件
     showWidgetArr.add(bottomItem('images/main/icon_main_addLock.png', '新增配件',
-        state.bottomBtnisUneable.value, () {
+        state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
       Navigator.pushNamed(context, Routers.accessoriesListPage);
     }));
 
@@ -507,7 +543,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_clockingIn.png',
           TranslationLoader.lanKeys!.checkingIn!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.checkingInListPage,
             arguments: state.keyInfos.value);
       }));
@@ -516,14 +552,14 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     showWidgetArr.add(bottomItem(
         'images/main/icon_main_operatingRecord.png',
         TranslationLoader.lanKeys!.operatingRecord!.tr,
-        state.bottomBtnisUneable.value, () {
+        state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.lockOperatingRecordPage,
           arguments: {"keyInfo": state.keyInfos.value});
     }));
 
     // 设置
     showWidgetArr.add(bottomItem('images/main/icon_main_set.png',
-        TranslationLoader.lanKeys!.set!.tr, state.bottomBtnisUneable.value, () {
+        TranslationLoader.lanKeys!.set!.tr, state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.lockSetPage, arguments: {
         "lockId": state.keyInfos.value.lockId,
         "isOnlyOneData": state.isOnlyOneData
@@ -541,7 +577,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_clockingIn.png',
           TranslationLoader.lanKeys!.checkingIn!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.checkingInListPage,
             arguments: state.keyInfos.value);
       }));
@@ -551,7 +587,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     showWidgetArr.add(bottomItem(
         'images/main/icon_main_electronicKey.png',
         TranslationLoader.lanKeys!.electronicKey!.tr,
-        state.bottomBtnisUneable.value, () {
+        state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.electronicKeyListPage,
           arguments: {"keyInfo": state.keyInfos.value});
     }));
@@ -560,7 +596,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     showWidgetArr.add(bottomItem(
         'images/main/icon_main_password.png',
         TranslationLoader.lanKeys!.password!.tr,
-        state.bottomBtnisUneable.value, () {
+        state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
       Get.toNamed(Routers.passwordKeyListPage,
           arguments: {"keyInfo": state.keyInfos.value});
     }));
@@ -570,7 +606,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_icCard.png',
           TranslationLoader.lanKeys!.card!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         // logic.showToast("普通用户第一次需要在锁旁边操作哦。", something: () {
         //   logic.showEasyLoading();
         // });
@@ -585,7 +621,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_fingerprint.png',
           TranslationLoader.lanKeys!.fingerprint!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.fingerprintListPage, arguments: {
           "lockId": state.keyInfos.value.lockId,
         });
@@ -597,7 +633,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_remoteControl.png',
           TranslationLoader.lanKeys!.remoteControl!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.remoteControlListPage);
       }));
     }
@@ -608,7 +644,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
         bottomItem(
             'images/main/icon_face.png',
             TranslationLoader.lanKeys!.humanFace!.tr,
-            state.bottomBtnisUneable.value, () {
+            state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
           Get.toNamed(Routers.faceList, arguments: {
             "lockId": state.keyInfos.value.lockId,
           }); // Toast.show(msg: "功能暂未开放");
@@ -622,7 +658,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
         bottomItem(
             'images/main/icon_catEyes.png',
             TranslationLoader.lanKeys!.monitoring!.tr,
-            state.bottomBtnisUneable.value, () {
+            state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
           Get.toNamed(Routers.realTimePicturePage, arguments: {
             "lockName": state.keyInfos.value.lockName,
             "isMonitoring": true
@@ -636,7 +672,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       showWidgetArr.add(bottomItem(
           'images/main/icon_main_authorizedAdmin.png',
           TranslationLoader.lanKeys!.authorizedAdmin!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.authorizedAdminListPage,
             arguments: {"keyInfo": state.keyInfos.value});
       }));
@@ -651,7 +687,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       bottomItem(
           'images/main/icon_main_operatingRecord.png',
           TranslationLoader.lanKeys!.operatingRecord!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         // Get.toNamed(Routers.lockOperatingRecordPage,
         //     arguments: {"keyInfo": state.keyInfos.value});
         Get.toNamed(Routers.doorLockLogPage,
@@ -661,7 +697,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       bottomItem(
           'images/main/icon_lockDetail_videoLog.png',
           TranslationLoader.lanKeys!.videoLog!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         //视频日志
         Get.toNamed(Routers.videoLogPage);
       }),
@@ -669,14 +705,11 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       bottomItem(
           'images/main/icon_lockDetail_messageReminding.png',
           TranslationLoader.lanKeys!.messageReminding!.tr,
-          state.bottomBtnisUneable.value, () {
+          state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
         Get.toNamed(Routers.msgNotificationPage);
       }),
       // 设置
-      bottomItem(
+      bottomItem('images/main/icon_main_set.png', TranslationLoader.lanKeys!.set!.tr, state.openDoorBtnisUneable.value, state.bottomBtnisEable.value, () {
-          'images/main/icon_main_set.png',
-          TranslationLoader.lanKeys!.set!.tr,
-          state.bottomBtnisUneable.value, () {
         // logic.clickItemBtnAction(10);
         Get.toNamed(Routers.lockSetPage, arguments: {
           "lockId": state.keyInfos.value.lockId,
@@ -689,16 +722,13 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
   }
 
   //
-  Widget bottomItem(
+  Widget bottomItem(String iconUrl, String name, bool openDoorBtnisUneable, bool bottomBtnisEable, Function() onClick) {
-      String iconUrl, String name, bool isForbidden, Function() onClick) {
     var width = 42.w;
     var height = 42.h;
     return GestureDetector(
-      onTap: isForbidden
+      onTap:openDoorBtnisUneable ? (bottomBtnisEable ? onClick : () {
-          ? () {
+        logic.showToast("请在锁旁边完成第一次开锁");
-              logic.showToast("请在锁旁边完成第一次开锁");
+      }) : null,
-            }
-          : onClick,
       child: Container(
           // height: 300.h,
           color: Colors.white,
@@ -707,14 +737,13 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
             children: [
               SizedBox(
                 width: width,
-                height:
+                height: height,
-                    height, // isForbidden ? "${iconUrl}_uneable.png" :"${iconUrl}.png"
                 child: Image.asset(iconUrl,
                     width: width,
                     height: height,
-                    color: isForbidden
+                    color: openDoorBtnisUneable ? (bottomBtnisEable
-                        ? AppColors.lockDetailBottomBtnUneable
+                        ? AppColors.mainColor
-                        : AppColors.mainColor,
+                        : AppColors.lockDetailBottomBtnUneable) : AppColors.lockDetailBottomBtnUneable,
                     fit: BoxFit.fitWidth),
               ),
               SizedBox(height: 10.w),
@@ -722,9 +751,9 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
                   child: Text(name,
                       style: TextStyle(
                           fontSize: 20.sp,
-                          color: isForbidden
+                          color:openDoorBtnisUneable ? (bottomBtnisEable
-                              ? AppColors.lockDetailBottomBtnUneable
+                              ? AppColors.blackColor
-                              : AppColors.blackColor),
+                              : AppColors.lockDetailBottomBtnUneable) : AppColors.lockDetailBottomBtnUneable),
                       textAlign: TextAlign.center))
             ],
           )),
@@ -747,8 +776,6 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
         }
       });
     });
-
-    // logic.connectBlueAndAnimationController();
   }
 
   String showElectricIcon(int electricnumber) {
@@ -865,7 +892,7 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
       // 电子钥匙lockUserNo为0 要先添加用户
       logic.addUserConnectBlue();
     } else {
-      print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
+      // print("state.isOpenLockNeedOnline.value:${state.isOpenLockNeedOnline.value}");
       if (state.isOpenLockNeedOnline.value == 0) {
         // 不需要联网
         logic.openDoorAction(1);
@@ -894,14 +921,14 @@ class _LockDetailPageState extends State<LockDetailPage> with TickerProviderStat
     }
   }
 
-  @override
+  // @override
-  void didChangeDependencies() {
+  // void didChangeDependencies() {
-    // TODO: implement didChangeDependencies
+  //   // TODO: implement didChangeDependencies
-    super.didChangeDependencies();
+  //   super.didChangeDependencies();
-
+  //
-    /// 路由订阅
+  //   /// 路由订阅
-    AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!);
+  //   AppRouteObserver().routeObserver.subscribe(this, ModalRoute.of(context)!);
-  }
+  // }
 
   @override
   void dispose() {

star_lock/lib/main/lockDetail/lockDetail/lockDetail_state.dart

@@ -35,7 +35,8 @@ class LockDetailState {
   var iSOpenLock = true.obs; // 是开锁还是关锁
   Timer? closedUnlockSuccessfulTimer;
 
-  var bottomBtnisUneable = false.obs; // 是否不可用 用于限制底部按钮是否可用
+  var bottomBtnisEable = true.obs; // 是否不可用 用于限制底部按钮是否可用
+  var openDoorBtnisUneable = true.obs; // 当钥匙状态不能使用的情况下开锁按钮禁止使用,默认可用
 
   //过渡动画控制器
   AnimationController? animationController;

star_lock/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_state.dart

@@ -11,7 +11,9 @@ class BasicInformationState {
 
   BasicInformationState() {
     var map = Get.arguments;
-    lockSetInfoData.value = map["lockSetInfoData"];
+    if(map["lockSetInfoData"] != null){
-    lockBasicInfo.value = lockSetInfoData.value.lockBasicInfo!;
+      lockSetInfoData.value = map["lockSetInfoData"];
+      lockBasicInfo.value = lockSetInfoData.value.lockBasicInfo!;
+    }
   }
 }

star_lock/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart

@@ -42,7 +42,7 @@ class _EditLockNamePageState extends State<EditLockNamePage> {
         ),
         body: Container(
           margin: EdgeInsets.only(left: 20.w, right: 20.w),
-          child: LoginInput(
+          child: LoginInput().tfInput(
               controller: state.changeLockNameController,
               leftWidget: const SizedBox(),
               hintText: "请输入名称",

star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_logic.dart

@@ -1,10 +1,10 @@
 
 import 'dart:async';
 
-
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 import '../../../../blue/blue_manage.dart';
+import '../../../../blue/io_protocol/io_getStarLockStatusInfo.dart';
 import '../../../../blue/io_protocol/io_timing.dart';
 import '../../../../blue/io_reply.dart';
 import '../../../../blue/io_tool/io_tool.dart';
@@ -28,58 +28,56 @@ class LockTimeLogic extends BaseGetXController{
       }
 
       // 获取锁状态
-      // if(reply is GetLockStatuReply) {
+      if(reply is GetStarLockStatuInfoReply && state.ifCurrentScreen.value == true) {
-      //   _replyGetLockStatus(reply);
+        _replyGetStarLockStatusInfo(reply);
-      // }
+      }
     });
   }
 
   // 获取锁状态数据解析
-  // Future<void> _replyGetLockStatus(Reply reply) async {
+  Future<void> _replyGetStarLockStatusInfo(Reply reply) async {
-  //   int status = reply.data[2];
+    int status = reply.data[2];
-  //   switch(status){
+    switch (status) {
-  //     case 0x00:
+      case 0x00:
-  //     //成功
+      //成功
-  //       print("${reply.commandType}数据解析成功");
+        print("${reply.commandType}数据解析成功");
-  //
+
-  //       // 锁当前时间
+        cancelBlueConnetctToastTimer();
-  //       var lockTime = reply.data.sublist(60, 64);
+        dismissEasyLoading();
-  //
+
-  //       int value = (
+        // 有效时间
-  //           (0xff & lockTime[(0)]) << 24 |
+        var indate = reply.data.sublist(149, 153);
-  //           (0xff & lockTime[1]) << 16 |
+        int indateValue = ((0xff & indate[(0)]) << 24 |
-  //           (0xff & lockTime[2]) << 8 |
+        (0xff & indate[1]) << 16 |
-  //           (0xFF & lockTime[3]));
+        (0xff & indate[2]) << 8 |
-  //
+        (0xFF & indate[3]));
-  //       String dataEime = DateTool().dateToYMDHNSString("$value");
+        state.dateTime.value = DateTool().dateToYMDHNSString("$indateValue");
-  //       state.dateTime.value = dataEime;
+        // state.dateTime = indateValue * 1000;
-  //
+        print("indate:$indate indateValue:$indateValue");
-  //       // String dataEime = DateTool().dateToYMDHNSString("${value}");
+
-  //       // state.dateTime.value = dataEime;
+        break;
-  //       print("lockTime:$lockTime value:$value dataEime:$dataEime");
+      case 0x06:
-  //       break;
+      //无权限
-  //     case 0x06:
+        print("${reply.commandType}需要鉴权");
-  //     //无权限
+
-  //       print("${reply.commandType}需要鉴权");
+        break;
-  //
+      case 0x07:
-  //       break;
+      //无权限
-  //     case 0x07:
+        print("${reply.commandType}用户无权限");
-  //     //无权限
+
-  //       print("${reply.commandType}用户无权限");
+        break;
-  //
+      case 0x09:
-  //       break;
+      // 权限校验错误
-  //     case 0x09:
+        print("${reply.commandType}权限校验错误");
-  //     // 权限校验错误
+
-  //       print("${reply.commandType}权限校验错误");
+        break;
-  //
+      default:
-  //       break;
+      //失败
-  //     default:
+        print("${reply.commandType}失败");
-  //     //失败
+
-  //       print("${reply.commandType}失败");
+        break;
-  //
+    }
-  //       break;
+  }
-  //   }
-  // }
 
   // 校时数据解析
   Future<void> _replyTiming(Reply reply) async {
@@ -88,17 +86,20 @@ class LockTimeLogic extends BaseGetXController{
       case 0x00:
       //成功
         print("${reply.commandType}数据解析成功");
+
         // var lockTime = reply.data.sublist(4, 8);
-        //
         // int value = (
         //     (0xff & lockTime[(0)]) << 24 |
         //     (0xff & lockTime[1]) << 16 |
         //     (0xff & lockTime[2]) << 8 |
         //     (0xFF & lockTime[3]));
-        //
+
         // String dataEime = DateTool().dateToYMDHNSString("$value");
         // state.dateTime.value = dataEime;
 
+        String dataEime = DateTool().dateToYMDHNSString("${state.dateTimestamp.value}");
+        state.dateTime.value = dataEime;
+
         state.sureBtnState.value = 0;
         cancelBlueConnetctToastTimer();
         dismissEasyLoading();
@@ -153,7 +154,8 @@ class LockTimeLogic extends BaseGetXController{
         IoSenderManage.senderTimingCommand(
           lockID:BlueManage().connectDeviceName,
           userID:await Storage.getUid(),
-          nowTime:DateTime.now().millisecondsSinceEpoch~/1000,
+          // nowTime:DateTime.now().millisecondsSinceEpoch~/1000,
+          nowTime: state.dateTimestamp.value,
           token:getTokenList,
           needAuthor:1,
           signKey:getSignKeyList,
@@ -170,6 +172,33 @@ class LockTimeLogic extends BaseGetXController{
     });
   }
 
+  // 获取锁状态 更新电量
+  Future<void> getStarLockStatus() async {
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
+    BlueManage().bludSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState deviceConnectionState) async {
+      if (deviceConnectionState == BluetoothConnectionState.connected) {
+        dismissEasyLoading();
+        var privateKey = await Storage.getStringList(saveBluePrivateKey);
+        List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
+        IoSenderManage.senderGetStarLockStatuInfo(
+          lockID: BlueManage().connectDeviceName,
+          userID: await Storage.getUid(),
+          privateKey: getPrivateKeyList,
+        );
+      } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {
+        dismissEasyLoading();
+        cancelBlueConnetctToastTimer();
+        if (state.ifCurrentScreen.value == true) {
+          showBlueConnetctToast();
+        }
+      }
+    });
+  }
+
   // 从网关获取时间
   void getLockTimeFromGateway() async{
     var entity = await ApiRepository.to.getLockTimeFromGateway(
@@ -186,8 +215,7 @@ class LockTimeLogic extends BaseGetXController{
         lockId: state.lockSetInfoData.value.lockId.toString(),
     );
     if(entity.errorCode!.codeIsSuccessful){
-      String dataEime = DateTool().dateToYMDHNSString("${entity.data!.date!}");
+      state.dateTimestamp.value = entity.data!.date!;
-      state.dateTime.value = dataEime;
       if(isSendBlue){
         sendTiming();
       }
@@ -201,8 +229,10 @@ class LockTimeLogic extends BaseGetXController{
     print("onReady()");
 
     _initReplySubscription();
+
+    // getStarLockStatus();
     // getLockTimeFromGateway();
-    getServerDatetime(false);
+    // getServerDatetime(false);
   }
 
   @override

star_lock/lib/main/lockDetail/lockSet/lockTime/lockTime_state.dart

@@ -5,6 +5,7 @@ import '../lockSet/lockSetInfo_entity.dart';
 class LockTimeState{
   var lockSetInfoData = LockSetInfoData().obs;
   var dateTime = "".obs;
+  var dateTimestamp = 0.obs;
 
   var ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
   var sureBtnState = 0.obs;// 0普通状态(可用) 1连接中(不可用)

star_lock/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart

@@ -83,7 +83,8 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
               KeySearchWidget(
                 editingController: state.searchController,
                 onSubmittedAction: () {
-                  logic.mockNetworkDataRequest();
+                  logic.pageNo = 1;
+                  getHttpData();
                 },
               ),
               SizedBox(
@@ -100,7 +101,8 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
                     Navigator.pushNamed(context, Routers.passwordKeyManagePage,
                         arguments: {"keyInfo": state.keyInfo.value}).then((val) {
                       if (val != null) {
-                        logic.mockNetworkDataRequest();
+                        logic.pageNo = 1;
+                        getHttpData();
                       }
                     });
                   }),
@@ -137,6 +139,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage> {
                     backgroundColor: Colors.red,
                     foregroundColor: Colors.white,
                     label: '删除',
+                    padding: EdgeInsets.only(left: 5.w, right: 5.w),
                   ),
                 ],
               ),

star_lock/lib/main/lockMian/lockList/lockList_logic.dart

@@ -1,6 +1,7 @@
 import 'package:star_lock/tools/baseGetXController.dart';
 
 import '../../../common/XSConstantMacro/XSConstantMacro.dart';
+import '../../../tools/dateTool.dart';
 import '../entity/lockListInfo_entity.dart';
 import 'lockList_state.dart';
 
@@ -27,35 +28,11 @@ class LockListLogic extends BaseGetXController{
     if(keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop){
       // 当是正常使用跟待接收状态的时候
       if(keyInfo.keyStatus == XSConstantMacro.keyStatusNormalUse || keyInfo.keyStatus == XSConstantMacro.keyStatusWaitReceive) {
-        return "余${compareTimeGetDaysFromNow(keyInfo.endDate!)}天";
+        return "余${DateTool().compareTimeGetDaysFromNow(keyInfo.endDate!)}天";
       } else {
         return XSConstantMacro.getKeyStatusStr(keyInfo.keyStatus!);
       }
     }
     return "";
   }
-
-  /// 获取是否超过现在的时间
-  bool compareTimeIsOvertime(int endTiem){
-    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(endTiem);  // 将时间戳转换为 DateTime
-    DateTime now = DateTime.now();  // 获取当前时间
-    if (now.isAfter(dateTime)) {
-      print('The timestamp is after the current time.');
-      // 过期
-      return true;
-    } else {
-      print('The timestamp is not after the current time.');
-      return false;
-    }
-  }
-
-  /// 获取两个距离当前时间相差几天 1705132260000
-  int compareTimeGetDaysFromNow(int endTiem){
-    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(endTiem);  // 将时间戳转换为 DateTime
-    DateTime now = DateTime.now();  // 获取当前时间
-    Duration difference = dateTime.difference(now);  // 计算两个日期之间的差异
-    int days = difference.inDays;  // 获取差异的天数
-    print('dateTime:$dateTime now:$now The difference is $days days.');
-    return days;
-  }
 }

star_lock/lib/main/lockMian/lockList/lockList_page.dart

@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 import '../../../appRouters.dart';
 import '../../../app_settings/app_colors.dart';
 import '../../../common/XSConstantMacro/XSConstantMacro.dart';
+import '../../../tools/dateTool.dart';
 import '../entity/lockListInfo_entity.dart';
 import 'lockListGroup_page.dart';
 import 'lockList_logic.dart';
@@ -98,7 +99,7 @@ class _LockListPageState extends State<LockListPage> {
             }
             // print("lockItemList.length:${lockItemList.length} == ${index+1} $isLast");
             return lockInfoListItem(keyInfo, isLast, () {
-              if(logic.compareTimeIsOvertime(keyInfo.endDate!) && keyInfo.keyType == XSConstantMacro.keyTypeTime){
+              if(DateTool().compareTimeIsOvertime(keyInfo.endDate!) && keyInfo.keyType == XSConstantMacro.keyTypeTime){
                 logic.showToast("钥匙已过期");
                 return;
               }
@@ -123,7 +124,7 @@ class _LockListPageState extends State<LockListPage> {
         // height: 122.h,
         margin: isLast ? EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w, bottom: 20.w) : EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
         decoration: BoxDecoration(
-          color: (logic.compareTimeIsOvertime(keyInfo.endDate!) && keyInfo.keyType == XSConstantMacro.keyTypeTime) ? AppColors.greyBackgroundColor : Colors.white,
+          color: (DateTool().compareTimeIsOvertime(keyInfo.endDate!) && keyInfo.keyType == XSConstantMacro.keyTypeTime) ? AppColors.greyBackgroundColor : Colors.white,
           borderRadius: BorderRadius.circular(20.w),
         ),
         child: Column(
@@ -193,7 +194,7 @@ class _LockListPageState extends State<LockListPage> {
             )),
             SizedBox(height: 20.h),
             Visibility(
-                visible: (keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop) ? true : false,
+                visible: ((keyInfo.keyType == XSConstantMacro.keyTypeTime || keyInfo.keyType == XSConstantMacro.keyTypeLoop) && (DateTool().compareTimeGetDaysFromNow(keyInfo.endDate!) < 30 && DateTool().compareTimeGetDaysFromNow(keyInfo.endDate!) > 0)) ? true : false,
               // visible: true,
                 child:Row(
                   children: [
@@ -202,7 +203,7 @@ class _LockListPageState extends State<LockListPage> {
                       padding: EdgeInsets.only(right: 5.w, left: 5.w),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(5.w),
-                        color: logic.compareTimeIsOvertime(keyInfo.endDate!) ? AppColors.listTimeYellowColor : AppColors.mainColor,
+                        color: DateTool().compareTimeIsOvertime(keyInfo.endDate!) ? AppColors.listTimeYellowColor : AppColors.mainColor,
                       ),
                         child: Text(logic.getKeyEffective(keyInfo), style: TextStyle(fontSize: 18.sp, color: Colors.white)
                       // child: Text(logic.compareTimeIsOvertime(keyInfo.endDate!) ? "已过期" : "余${logic.compareTimeGetDaysFromNow(keyInfo.endDate!)}天", style: TextStyle(fontSize: 18.sp, color: Colors.white)

star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart

@@ -85,7 +85,7 @@ class LockMainLogic extends BaseGetXController {
     print("onReady()");
 
     // 开启UDP
-    UdpHelp().openUDP();
+    // UdpHelp().openUDP();
 
     BlueManage();
   }

star_lock/lib/main/lockMian/lockMain/lockMain_page.dart

@@ -139,6 +139,7 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
       case 1:
         // 只有一条数据
         Storage.setBool(ifIsDemoModeOrNot, false);
+        print("state.lockListInfoEntity.value.data!.groupList![0].lockList![0]:${state.lockListInfoEntity.value.data!.groupList![0].lockList![0].endDate}");
         returnWidget = LockDetailPage(
             isOnlyOneData: true,
             lockListInfoItemEntity: state

star_lock/lib/mine/message/messageList/messageList_page.dart

@@ -77,6 +77,7 @@ class _MessageListPageState extends State<MessageListPage> with TickerProviderSt
                             backgroundColor: Colors.red,
                             foregroundColor: Colors.white,
                             label: '删除',
+                            padding: EdgeInsets.only(left: 5.w, right: 5.w),
                           ),
                         ],
                       ),

star_lock/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart

@@ -89,7 +89,7 @@ class _MinePersonInfoEditIphonePageState
                 color: Colors.grey,
               ),
               SizedBox(height: 10.w),
-              LoginInput(
+              LoginInput().tfInput(
                   controller: _phoneController,
                   isPwd: true,
                   leftWidget: const SizedBox(),
@@ -102,7 +102,7 @@ class _MinePersonInfoEditIphonePageState
               Row(
                 children: [
                   Expanded(
-                    child: LoginInput(
+                    child: LoginInput().tfInput(
                         controller: _codeController,
                         isPwd: true,
                         leftWidget: const SizedBox(),

star_lock/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart

@@ -50,7 +50,7 @@ class _MinePersonInfoEditNamePageState
           padding: EdgeInsets.all(15.w),
           child: Column(
             children: [
-              LoginInput(
+              LoginInput().tfInput(
                   controller: state.nickNameController,
                   onchangeAction: (textStr) {
                     logic.checkNext(state.nickNameController);

star_lock/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart

@@ -45,7 +45,7 @@ class _MineBindPhoneOrEmailPageState extends State<MineBindPhoneOrEmailPage> {
                         : TranslationLoader.lanKeys!.changeEmailTip!.tr,
                     style: TextStyle(fontSize: 20.sp),
                   )),
-              LoginInput(
+              LoginInput().tfInput(
                   controller: state.accountController,
                   isPwd: false,
                   onchangeAction: (textStr) {
@@ -62,7 +62,7 @@ class _MineBindPhoneOrEmailPageState extends State<MineBindPhoneOrEmailPage> {
               Row(
                 children: [
                   Expanded(
-                    child: LoginInput(
+                    child: LoginInput().tfInput(
                         controller: state.codeController,
                         isPwd: false,
                         leftWidget: const SizedBox(),

star_lock/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart

@@ -36,7 +36,7 @@ class _MinePersonInfoResetPasswordPageState
           margin: EdgeInsets.only(left: 30.w, right: 30.w),
           child: Column(
             children: [
-              LoginInput(
+              LoginInput().tfInput(
                   controller: state.oldPwdController,
                   onchangeAction: (textStr) {
                     logic.changeInput(state.oldPwdController);
@@ -50,7 +50,7 @@ class _MinePersonInfoResetPasswordPageState
                   inputFormatters: [
                     LengthLimitingTextInputFormatter(20),
                   ]),
-              LoginInput(
+              LoginInput().tfInput(
                   controller: state.newPwdController,
                   onchangeAction: (textStr) {
                     logic.changeInput(state.newPwdController);
@@ -64,7 +64,7 @@ class _MinePersonInfoResetPasswordPageState
                   inputFormatters: [
                     LengthLimitingTextInputFormatter(20),
                   ]),
-              LoginInput(
+              LoginInput().tfInput(
                   controller: state.surePwdController,
                   onchangeAction: (textStr) {
                     logic.changeInput(state.surePwdController);

star_lock/lib/tools/EasyRefreshTool.dart

@@ -47,6 +47,7 @@ class _EasyRefreshToolState extends State<EasyRefreshTool> {
       controller: _controller,
       header: const MaterialHeader(),
       footer: const MaterialFooter(),
+      triggerAxis: Axis.vertical,
       onRefresh: widget.onRefresh!=null?() async {
         if(widget.onRefresh != null){
           widget.onRefresh!();

star_lock/lib/tools/dateTool.dart

@@ -53,4 +53,28 @@ class DateTool {
     String appointmentDate = formatDate(nowDate, [HH,':',nn]);
     return appointmentDate;
   }
+
+  /// 获取是否超过现在的时间
+  bool compareTimeIsOvertime(int endTiem){
+    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(endTiem);  // 将时间戳转换为 DateTime
+    DateTime now = DateTime.now();  // 获取当前时间
+    if (now.isAfter(dateTime)) {
+      print('The timestamp is after the current time.');
+      // 过期
+      return true;
+    } else {
+      print('The timestamp is not after the current time.');
+      return false;
+    }
+  }
+
+  /// 获取两个距离当前时间相差几天 1705132260000
+  int compareTimeGetDaysFromNow(int endTiem){
+    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(endTiem);  // 将时间戳转换为 DateTime
+    DateTime now = DateTime.now();  // 获取当前时间
+    Duration difference = dateTime.difference(now);  // 计算两个日期之间的差异
+    int days = difference.inDays;  // 获取差异的天数
+    print('dateTime:$dateTime now:$now The difference is $days days.');
+    return days;
+  }
 }

star_lock/lib/tools/tf_loginInput.dart

@@ -8,67 +8,61 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 * */
 
 typedef BlockStrCallback = void Function(dynamic textStr);
-class LoginInput extends StatelessWidget {
-  TextEditingController? controller;
-  List<TextInputFormatter>? inputFormatters;
-  TextInputType? keyboardType;
-  Color? background;
-  String? hintText;
-  bool? isHaveLeftWidget;
-  Widget? leftWidget;
-  String? label;
-  bool? isPwd;
-  Widget? rightSlot;
-  BlockStrCallback? onchangeAction;
-  LoginInput(
-      {Key? key,
-      required this.controller,
-      this.rightSlot,
-      this.label,
-      this.isPwd,
-      this.inputFormatters,
-      this.keyboardType,
-      this.background,
-      this.hintText,
-      this.isHaveLeftWidget = true,
-      this.leftWidget,
-      this.onchangeAction})
-      : super(key: key);
 
-  @override
+class LoginInput{
-  Widget build(BuildContext context) {
+
-    return Container(
+  Widget tfInput({
+    TextEditingController? controller,
+    List<TextInputFormatter>? inputFormatters,
+    TextInputType? keyboardType,
+    Color? background,
+    String? hintText,
+    bool? isHaveLeftWidget,
+    Widget? leftWidget,
+    String? label,
+    bool? isPwd,
+    Widget? rightSlot,
+    BlockStrCallback? onchangeAction}) {
+    return SizedBox(
       // color: Colors.red,
-      // width: 1.sp,
+      width: 1.sp,
       // height: 200.h,
       child: Column(
         children: [
-          TextField(
+          Row(
-            //输入框一行
+            children: [
-            maxLines: 1,
+              leftWidget ?? SizedBox(width: 36.w, height: 36.w),
-            controller: controller,
+              SizedBox(width: 40.w,),
-            onChanged: onchangeAction,
+              Expanded(
-            autofocus: false,
+                child: TextField(
-          inputFormatters:inputFormatters,
+                  //输入框一行
-            decoration: InputDecoration(
+                  maxLines: 1,
-              //输入里面输入文字内边距设置
+                  controller: controller,
-              contentPadding: const EdgeInsets.only(
+                  onChanged: onchangeAction,
-                  top: 8.0, left: -19.0, right: -15.0, bottom: 8.0),
+                  // autofocus: false,
-              labelText: label,
+                  inputFormatters:inputFormatters,
-              labelStyle: TextStyle(fontSize: 22.sp),
+                  decoration: InputDecoration(
-              hintStyle: TextStyle(fontSize: 22.sp),
+                    //输入里面输入文字内边距设置
-              hintText: hintText,
+                    contentPadding: const EdgeInsets.only(
-              //不需要输入框下划线
+                        top: 8.0, left: -19.0, right: -15.0, bottom: 8.0),
-              border: InputBorder.none,
+                    labelText: label,
-              //左边图标设置
+                    labelStyle: TextStyle(fontSize: 22.sp),
-              icon: isHaveLeftWidget == true
+                    hintStyle: TextStyle(fontSize: 22.sp),
-                  ? leftWidget
+                    hintText: hintText,
-                  : SizedBox(
+                    //不需要输入框下划线
-                      width: 20.w,
+                    border: InputBorder.none,
-                      height: 40.w,
+                    //左边图标设置
-                    ),
+                    // icon: isHaveLeftWidget == true
-            ),
+                    //     ? leftWidget
-            obscureText: isPwd ?? false,
+                    //     : SizedBox(
+                    //   width: 20.w,
+                    //   height: 40.w,
+                    // ),
+                  ),
+                  obscureText: isPwd ?? false,
+                ),
+              ),
+            ],
           ),
           Container(
             height: 0.5.h,