diff --git a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
index 94b20c86..3ec4635b 100755
--- a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
+++ b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart
@@ -50,7 +50,7 @@ class _CardDetailPageState extends State<CardDetailPage> with RouteAware {
                 ShowTipView().showTFViewAlertDialog(
                     state.changeNameController,
                     '请输入姓名'.tr,
-                    '', () {
+                    '请输入姓名'.tr, () {
                   if (state.changeNameController.text.isEmpty) {
                     logic.showToast('请输入姓名'.tr);
                     return;
diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index a6528d18..a5780ab3 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -25,7 +25,6 @@ class DoorLockLogLogic extends BaseGetXController {
 
   // 获取解析后的数据
   late StreamSubscription<Reply> _replySubscription;
-
   void _initReplySubscription() {
     _replySubscription =
         EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
@@ -77,8 +76,10 @@ class DoorLockLogLogic extends BaseGetXController {
                 (0xff & indexList[5]) << 8 |
                 (0xFF & indexList[6]);
             final operateDate = time * 1000;
+            final serverTime = state.currentDate;
             if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter(
-                DateTime.fromMillisecondsSinceEpoch(state.currentDate))) {
+                DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) {
+              // AppLog.log('operateDate:$operateDate state.currentDate:${state.currentDate}');
               continue;
             }
             indexMap['date'] = '$operateDate';
@@ -213,6 +214,7 @@ class DoorLockLogLogic extends BaseGetXController {
 
   // 操作记录上传
   Future<void> lockRecordUploadData(List list) async {
+    AppLog.log('上传数据：$list');
     // 无数据时不上传
     if(list.isEmpty){
       return;
@@ -251,7 +253,7 @@ class DoorLockLogLogic extends BaseGetXController {
     if (isDemoMode == false) {
       // _initReplySubscription();
 
-      mockNetworkDataRequest(isRefresh: true);
+      // mockNetworkDataRequest(isRefresh: true);
       _getDoorLockLogListRefreshUIAction();
     }
   }
diff --git a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
index 156955f6..b83b7863 100755
--- a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
+++ b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart
@@ -50,7 +50,7 @@ class _FaceDetailPageState extends State<FaceDetailPage> with RouteAware {
                 ShowTipView().showTFViewAlertDialog(
                     state.changeNameController,
                     '修改姓名'.tr,
-                    '', () {
+                    '修改姓名'.tr, () {
                   if (state.changeNameController.text.isEmpty) {
                     logic.showToast('请输入姓名'.tr);
                     return;
diff --git a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
index 735ac175..126bba47 100755
--- a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
+++ b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart
@@ -50,7 +50,7 @@ class _FingerprintDetailPageState extends State<FingerprintDetailPage>
                 ShowTipView().showTFViewAlertDialog(
                     state.changeNameController,
                     '修改姓名'.tr,
-                    '', () {
+                    '修改姓名'.tr, () {
                   if (state.changeNameController.text.isEmpty) {
                     logic.showToast('请输入姓名'.tr);
                     return;
diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index fb186a7f..c14580e5 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -489,6 +489,9 @@ class LockDetailLogic extends BaseGetXController {
 
   // 操作记录上传
   Future<void> lockRecordUploadData(List list) async {
+    if(list.isEmpty){
+      return;
+    }
     final KeyOperationRecordEntity entity = await ApiRepository.to
         .lockRecordUploadData(
             lockId: state.keyInfos.value.lockId.toString(), records: list);
diff --git a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
index 59a5d42e..41b51807 100755
--- a/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
+++ b/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
@@ -74,8 +74,9 @@ class LockOperatingRecordLogic extends BaseGetXController {
                 (0xff & indexList[5]) << 8 |
                 (0xFF & indexList[6]);
             final operateDate = time * 1000;
+            final serverTime = state.currentDate;
             if (DateTime.fromMillisecondsSinceEpoch(operateDate).isAfter(
-                DateTime.fromMillisecondsSinceEpoch(state.currentDate))) {
+                DateTime.fromMillisecondsSinceEpoch(serverTime*1000))) {
               continue;
             }
             indexMap['date'] = '$operateDate';
@@ -192,6 +193,9 @@ class LockOperatingRecordLogic extends BaseGetXController {
 
   // 操作记录上传
   Future<void> lockRecordUploadData(List list) async {
+    if(list.isEmpty){
+      return;
+    }
     final KeyOperationRecordEntity entity = await ApiRepository.to
         .lockRecordUploadData(
             lockId: CommonDataManage().currentKeyInfo.lockId.toString(),
diff --git a/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart b/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart
index fc9a77cf..89abaf6f 100755
--- a/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart
+++ b/lib/main/lockDetail/lockSet/basicInformation/lockSelectGrouping/lockSelectGrouping_page.dart
@@ -46,7 +46,10 @@ class _LockSelectGroupingPageState extends State<LockSelectGroupingPage> {
               padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
               onClick: () {
                 // showCupertinoAlertDialog(context);
-                ShowTipView().showTFViewAlertDialog(state.changeNameController, TranslationLoader.lanKeys!.createNewGroup!.tr, '请输入分组名称'.tr, (){
+                ShowTipView().showTFViewAlertDialog(
+                    state.changeNameController,
+                    TranslationLoader.lanKeys!.createNewGroup!.tr,
+                    '请输入分组名称'.tr, (){
                   logic.addLockGroupRequest();
                   Get.back();
                 }, isShowSuffixIcon:true, inputFormatters: <TextInputFormatter>[
diff --git a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart
index 73ddc75c..6e837329 100755
--- a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart
+++ b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart
@@ -46,7 +46,7 @@ class _RemoteControlDetailPageState extends State<RemoteControlDetailPage> with
               isHaveDirection: false,
               isHaveLine: true)),
           Obx(() => lockDataListItem('姓名'.tr, state.typeName.value, () {
-                ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '', () {
+                ShowTipView().showTFViewAlertDialog(state.changeNameController, '修改姓名'.tr, '修改姓名'.tr, () {
                   if (state.changeNameController.text.isEmpty) {
                     logic.showToast('请输入姓名'.tr);
                     return;