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

# Conflicts:
#	star_lock/lib/blue/sender_beforeDataManage.dart
#	star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

star_lock/images/lan/lan_en.json

@@ -712,7 +712,7 @@
   "请输入手机号": "Please enter mobile phone number",
   "家人到家": "Family gets home",
   "添加家人": "Add family",
-  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择": "If the lock is not connected to the Internet, in addition to the electronic key, the password, card, fingerprint and other door reminders can not be sent in time, please choose according to your actual situation",
+  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。": "If the lock is not connected to the Internet, in addition to the electronic key, the password, card, fingerprint and other door reminders can not be sent in time, please choose according to your actual situation",
   "消息提醒": "Message reminder",
   "开门通知": "Opening notice",
   "N天未开门": "N days without opening the door",
@@ -844,5 +844,14 @@
   "钥匙无效": "The key is invalid",
   "操作失败，请确认锁是否在附近，或重启手机蓝牙后再试。": "The operation failed. Please confirm whether the lock is nearby, or restart your phone's Bluetooth and try again.",
   "如果是全自动锁，请使屏幕变亮": "If it is a fully automatic lock, please make the screen brighter",
-  "正在尝试闭锁……": "Attempting to lock..."
+  "正在尝试闭锁……": "Attempting to lock...",
+  "清空记录":"Clear record",
+  "是否要删除操作记录？":"Do you want to delete the operation record?",
+  "被删除的记录不能恢复":"The deleted record cannot be restored",
+  "全部事件":"All events",
+  "开锁事件":"Unlock event",
+  "异常事件":"Abnormal event",
+  "门铃事件":"Doorbell event",
+  "视频事件":"Video event"
+
 }

star_lock/images/lan/lan_keys.json

@@ -740,7 +740,7 @@
   "请输入手机号":"请输入手机号",
   "家人到家":"家人到家",
   "添加家人":"添加家人",
-  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择":"若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择",
+  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。":"若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。",
   "消息提醒":"消息提醒",
   "开门通知":"开门通知",
   "N天未开门":"N天未开门",
@@ -872,5 +872,13 @@
   "钥匙无效": "钥匙无效",
   "操作失败，请确认锁是否在附近，或重启手机蓝牙后再试。": "操作失败，请确认锁是否在附近，或重启手机蓝牙后再试。",
   "如果是全自动锁，请使屏幕变亮": "如果是全自动锁，请使屏幕变亮",
-  "正在尝试闭锁……": "正在尝试闭锁……"
+  "正在尝试闭锁……": "正在尝试闭锁……",
+  "清空记录":"清空记录",
+  "是否要删除操作记录？":"是否要删除操作记录？",
+  "被删除的记录不能恢复":"被删除的记录不能恢复",
+  "全部事件":"全部事件",
+  "开锁事件":"开锁事件",
+  "异常事件":"异常事件",
+  "门铃事件":"门铃事件",
+  "视频事件":"视频事件"
 }

star_lock/images/lan/lan_zh.json

@@ -712,7 +712,7 @@
   "请输入手机号": "请输入手机号",
   "家人到家": "家人到家",
   "添加家人": "添加家人",
-  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择": "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择",
+  "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。": "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。",
   "消息提醒": "消息提醒",
   "开门通知": "开门通知",
   "N天未开门": "N天未开门",
@@ -842,5 +842,13 @@
   "钥匙无效": "钥匙无效",
   "操作失败，请确认锁是否在附近，或重启手机蓝牙后再试。": "操作失败，请确认锁是否在附近，或重启手机蓝牙后再试。",
   "如果是全自动锁，请使屏幕变亮": "如果是全自动锁，请使屏幕变亮",
-  "正在尝试闭锁……": "正在尝试闭锁……"
+  "正在尝试闭锁……": "正在尝试闭锁……",
+  "清空记录":"清空记录",
+  "是否要删除操作记录？":"是否要删除操作记录？",
+  "被删除的记录不能恢复":"被删除的记录不能恢复",
+  "全部事件":"全部事件",
+  "开锁事件":"开锁事件",
+  "异常事件":"异常事件",
+  "门铃事件":"门铃事件",
+  "视频事件":"视频事件"
 }

star_lock/ios/Podfile.lock

@@ -351,4 +351,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 317f9473a5705c6fe4d79d95e81676f248048fdc
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3

star_lock/lib/blue/blue_manage.dart

@@ -696,7 +696,8 @@ class BlueManage {
       // if(bluetoothConnectDevice != null && bluetoothConnectDevice!.connectionState == BluetoothConnectionState.connected){
       connectDeviceMacAddress = "";
       if (bluetoothConnectionState == BluetoothConnectionState.connected) {
-        await bluetoothConnectDevice!.disconnect();
+        //加快蓝牙断连
+        await bluetoothConnectDevice!.disconnect(timeout: 2);
         AppLog.log("断开连接成功");
       }
       // }

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -6,9 +5,9 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_state.dart';
 import 'package:star_lock/main/lockDetail/lockOperatingRecord/lockOperatingRecordGetLastRecordTime_entity.dart';
+import 'package:star_lock/tools/commonDataManage.dart';
 import 'package:star_lock/tools/eventBusEventManage.dart';
 
-import '../../../app_settings/app_settings.dart';
 import '../../../blue/blue_manage.dart';
 import '../../../blue/io_protocol/io_referEventRecordTime.dart';
 import '../../../blue/io_reply.dart';
@@ -26,16 +25,17 @@ class DoorLockLogLogic extends BaseGetXController {
   // 获取解析后的数据
   late StreamSubscription<Reply> _replySubscription;
   void _initReplySubscription() {
-    _replySubscription = EventBusManager().eventBus!.on<Reply>().listen((reply) {
+    _replySubscription =
-
+        EventBusManager().eventBus!.on<Reply>().listen((reply) {
-      if (reply is SenderReferEventRecordTimeReply && state.ifCurrentScreen.value == true) {
+      if (reply is SenderReferEventRecordTimeReply &&
+          state.ifCurrentScreen.value == true) {
         _replyReferEventRecordTime(reply);
       }
     });
   }
 
   // 根据时间查解析数据
-  Future<void>  _replyReferEventRecordTime(Reply reply) async {
+  Future<void> _replyReferEventRecordTime(Reply reply) async {
     cancelBlueConnetctToastTimer();
     int status = reply.data[2];
     switch (status) {
@@ -47,7 +47,7 @@ class DoorLockLogLogic extends BaseGetXController {
         if (dataLength > 0) {
           reply.data.removeRange(0, 7);
           // 把得到的数据按8位分割成数组  然后塞进一个新的数组里面
-          if(reply.data.length < 17){
+          if (reply.data.length < 17) {
             return;
           }
           var getList = splitList(reply.data, 17);
@@ -59,11 +59,10 @@ class DoorLockLogLogic extends BaseGetXController {
             var indexMap = {};
             indexMap["type"] = indexList[0].toString();
 
-            if(indexList[0] == 2){
+            if (indexList[0] == 2) {
               var passwordData = indexList.sublist(7, 17);
               var password = utf8String(passwordData);
               indexMap["user"] = password.toString();
-            }else{
               int userNo = (indexList[1]*256) + indexList[2];
               indexMap["user"] = userNo.toString();
             }
@@ -71,15 +70,15 @@ class DoorLockLogLogic extends BaseGetXController {
             indexMap["success"] = "1";
 
             int time = ((0xff & indexList[(3)]) << 24 |
-            (0xff & indexList[4]) << 16 |
+                (0xff & indexList[4]) << 16 |
-            (0xff & indexList[5]) << 8 |
+                (0xff & indexList[5]) << 8 |
-            (0xFF & indexList[6]));
+                (0xFF & indexList[6]));
             indexMap["date"] = "${time * 1000}";
             uploadList.add(indexMap);
           }
           lockRecordUploadData(uploadList);
 
-          if(dataLength == state.logCountPage){
+          if (dataLength == state.logCountPage) {
             state.ifHaveNext = true;
           }
         }
@@ -97,10 +96,11 @@ class DoorLockLogLogic extends BaseGetXController {
   // 查询事件记录(时间查询)
   Future<void> senderReferEventRecordTime() async {
     showEasyLoading();
-    showBlueConnetctToastTimer(action: (){
+    showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
     });
-    BlueManage().bludSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionStateState) async {
+    BlueManage().bludSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionStateState) async {
       if (connectionStateState == BluetoothConnectionState.connected) {
         var privateKey = await Storage.getStringList(saveBluePrivateKey);
         List<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
@@ -122,10 +122,11 @@ class DoorLockLogLogic extends BaseGetXController {
           publicKey: getPublicKeyList,
           privateKey: getPrivateKeyList,
         );
-      } else if (connectionStateState == BluetoothConnectionState.disconnected) {
+      } else if (connectionStateState ==
+          BluetoothConnectionState.disconnected) {
         dismissEasyLoading();
         cancelBlueConnetctToastTimer();
-        if(state.ifCurrentScreen.value == true){
+        if (state.ifCurrentScreen.value == true) {
           showBlueConnetctToast();
         }
       }
@@ -134,6 +135,7 @@ class DoorLockLogLogic extends BaseGetXController {
 
   //请求操作记录列表（门锁日志）
   void mockNetworkDataRequest() async {
+    state.lockLogItemList.clear();
     DoorLockLogEntity entity = await ApiRepository.to.lockEventList(
         lockId: state.keyInfos.value.lockId!,
         lockEventType: state.dropdownValue.value,
@@ -141,9 +143,16 @@ class DoorLockLogLogic extends BaseGetXController {
         pageSize: int.parse(pageSize),
         startDate: state.startDate.value,
         endDate: state.endDate.value);
-
     if (entity.errorCode!.codeIsSuccessful) {
-      state.lockLogItemList.value = entity.data!.itemList!;
+      if (pageNo == 1) {
+        state.lockLogItemList.value = entity.data!.itemList!;
+        pageNo++;
+      } else {
+        if (entity.data!.itemList!.isNotEmpty) {
+          state.lockLogItemList.addAll(entity.data!.itemList!);
+          pageNo++;
+        }
+      }
     }
   }
 
@@ -152,15 +161,18 @@ class DoorLockLogLogic extends BaseGetXController {
   void _getDoorLockLogListRefreshUIAction() {
     _getDoorLockLogListRefreshUIEvent =
         eventBus.on<DoorLockLogListRefreshUI>().listen((event) {
+      state.currentSelectDate.value = event.getDoorLockLogTime;
 // 设置startDate为当天的0点
-      state.startDate.value = DateTime(event.getDoorLockLogTime.year,
+      state.startDate.value = DateTime(
-              event.getDoorLockLogTime.month, event.getDoorLockLogTime.day)
+              state.currentSelectDate.value.year,
+              state.currentSelectDate.value.month,
+              state.currentSelectDate.value.day)
           .millisecondsSinceEpoch;
 // 设置endDate为下一天的0点，然后减去1毫秒
       state.endDate.value = (DateTime(
-                  event.getDoorLockLogTime.year,
+                  state.currentSelectDate.value.year,
-                  event.getDoorLockLogTime.month,
+                  state.currentSelectDate.value.month,
-                  event.getDoorLockLogTime.day + 1)
+                  state.currentSelectDate.value.day + 1)
               .subtract(const Duration(milliseconds: 1)))
           .millisecondsSinceEpoch;
 
@@ -186,9 +198,9 @@ class DoorLockLogLogic extends BaseGetXController {
         .lockRecordUploadData(
             lockId: state.keyInfos.value.lockId.toString(), records: list);
     if (entity.errorCode!.codeIsSuccessful) {
-      if(state.ifHaveNext == true){
+      if (state.ifHaveNext == true) {
         getLockRecordLastUploadDataTime();
-      }else{
+      } else {
         pageNo = 1;
         mockNetworkDataRequest();
       }
@@ -197,10 +209,14 @@ class DoorLockLogLogic extends BaseGetXController {
 
   //清空操作记录
   void clearOperationRecordRequest() async {
-    KeyOperationRecordEntity entity =
+    KeyOperationRecordEntity entity = await ApiRepository.to
-        await ApiRepository.to.clearOperationRecord('28');
+        .clearOperationRecord(
+            CommonDataManage().currentKeyInfo.lockId.toString());
     if (entity.errorCode!.codeIsSuccessful) {
-      showToast("清除数据成功");
+      showToast("清除数据成功", something: () {
+        pageNo = 1;
+        mockNetworkDataRequest();
+      });
     }
   }
 

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart

@@ -5,9 +5,11 @@ import 'package:get/get.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_entity.dart';
 import 'package:star_lock/main/lockDetail/doorLockLog/doorLockLog_logic.dart';
+import 'package:star_lock/tools/EasyRefreshTool.dart';
 import 'package:star_lock/tools/advancedCalendar/src/widget.dart';
 import 'package:star_lock/tools/menuItem/xsDropDownWidget.dart';
 import 'package:star_lock/tools/noData.dart';
+import 'package:star_lock/tools/showCupertinoAlertView.dart';
 import 'package:timelines/timelines.dart';
 
 import '../../../app_settings/app_colors.dart';
@@ -26,11 +28,6 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
   final logic = Get.put(DoorLockLogLogic());
   final state = Get.find<DoorLockLogLogic>().state;
 
-  @override
-  void initState() {
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -39,6 +36,19 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
         barTitle: TranslationLoader.lanKeys!.operatingRecord!.tr,
         haveBack: true,
         backgroundColor: AppColors.mainColor,
+        actionsList: [
+          TextButton(
+              onPressed: () {
+                ShowCupertinoAlertView().showClearOperationRecordAlert(
+                    clearClick: () {
+                  logic.clearOperationRecordRequest();
+                });
+              },
+              child: Text(
+                '清空记录'.tr,
+                style: TextStyle(color: Colors.white, fontSize: 24.sp),
+              )),
+        ],
       ),
       body: Column(
         mainAxisSize: MainAxisSize.max,
@@ -52,7 +62,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
             endIndent: 30.w,
           ),
           eventDropDownWidget(),
-          Expanded(child: Obx(() => timeLineView(state.lockLogItemList)))
+          Expanded(child: timeLineView())
         ],
       ),
     );
@@ -81,19 +91,34 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
         highlightColor: Colors.yellow,
         disabledColor: Colors.grey,
       ),
-      child: AdvancedCalendar(
+      child: Stack(
-        controller: state.calendarControllerCustom,
+        children: [
-        events: state.events,
+          AdvancedCalendar(
-        weekLineHeight: 48.0,
+            controller: state.calendarControllerCustom,
-        startWeekDay: 1,
+            events: state.events,
-        innerDot: true,
+            weekLineHeight: 48.0,
-        keepLineSize: true,
+            startWeekDay: 1,
-        calendarTextStyle: const TextStyle(
+            innerDot: true,
-          fontSize: 18,
+            keepLineSize: true,
-          fontWeight: FontWeight.w400,
+            calendarTextStyle: const TextStyle(
-          height: 1.3125,
+              fontSize: 18,
-          letterSpacing: 0,
+              fontWeight: FontWeight.w400,
-        ),
+              height: 1.3125,
+              letterSpacing: 0,
+            ),
+          ),
+          Positioned(
+            top: 8.0,
+            right: 8.0,
+            child: Obx(() => Text(
+                  '${state.currentSelectDate.value.year}年${state.currentSelectDate.value.month}月',
+                  style: theme.textTheme.titleMedium!.copyWith(
+                    fontSize: 16,
+                    color: theme.colorScheme.secondary,
+                  ),
+                )),
+          ),
+        ],
       ),
     );
   }
@@ -118,77 +143,16 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
   }
 
 //时间轴组件
-  Widget timeLineView(List<DoorLockLogDataItem> timelineDataList) {
+  Widget timeLineView() {
     return Container(
       margin: EdgeInsets.only(left: 20.w, right: 20.w, bottom: 20.h, top: 20.h),
       decoration: BoxDecoration(
         color: Colors.white,
         borderRadius: BorderRadius.circular(16.w),
       ),
-      child: timelineDataList.isNotEmpty
+      child: Obx(() => state.lockLogItemList.isNotEmpty
           ? Timeline.tileBuilder(
-              builder: TimelineTileBuilder.fromStyle(
+              builder: _timelineBuilderWidget(),
-                contentsAlign: ContentsAlign.basic,
-                itemCount: timelineDataList.length,
-                contentsBuilder: (context, index) {
-                  DoorLockLogDataItem timelineData = timelineDataList[index];
-                  DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(
-                      timelineData.operateDate!);
-                  String formattedTime =
-                      '${dateTime.hour.toString().padLeft(2, '0')}:${dateTime.minute.toString().padLeft(2, '0')}';
-
-                  return Padding(
-                    padding: EdgeInsets.only(left: 20.w, top: 20.h),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          '$formattedTime ${timelineData.recordTypeName}',
-                          textAlign: TextAlign.left,
-                          style: TextStyle(
-                            color: Colors.black,
-                            fontSize: 24.sp,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        SizedBox(
-                          height: 10.h,
-                        ),
-                        GestureDetector(
-                          onTap: () {
-                            Get.toNamed(Routers.videoLogDetailPage);
-                          },
-                          child: Stack(
-                            children: [
-                              timelineData.imagesUrl!.isNotEmpty
-                                  ? Image.network(
-                                      timelineData.imagesUrl!,
-                                      width: 260.w,
-                                      height: 260.h,
-                                    )
-                                  : Container(),
-                              Positioned(
-                                top: 150.h,
-                                left: 10.w,
-                                child: Image(
-                                  image: const AssetImage(
-                                      'images/main/icon_lockLog_play.png'),
-                                  width: 24.w,
-                                  height: 20.w,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        SizedBox(
-                          height: 20.h,
-                        ),
-                      ],
-                    ),
-                  );
-                },
-              ),
               theme: TimelineThemeData(
                 nodePosition: 0.04, //居左侧距离
                 connectorTheme: const ConnectorThemeData(
@@ -203,7 +167,72 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
                 ),
               ),
             )
-          : NoData(),
+          : NoData()),
+    );
+  }
+
+  TimelineTileBuilder _timelineBuilderWidget() {
+    return TimelineTileBuilder.fromStyle(
+      contentsAlign: ContentsAlign.basic,
+      itemCount: state.lockLogItemList.length,
+      contentsBuilder: (context, index) {
+        DoorLockLogDataItem timelineData = state.lockLogItemList[index];
+        DateTime dateTime =
+            DateTime.fromMillisecondsSinceEpoch(timelineData.operateDate!);
+        String formattedTime =
+            '${dateTime.hour.toString().padLeft(2, '0')}:${dateTime.minute.toString().padLeft(2, '0')}';
+
+        return Padding(
+          padding: EdgeInsets.only(left: 20.w, top: 20.h),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                '$formattedTime ${timelineData.username!.isNotEmpty ? "${timelineData.username}用" : ""}${timelineData.recordTypeName}',
+                textAlign: TextAlign.left,
+                style: TextStyle(
+                  color: Colors.black,
+                  fontSize: 24.sp,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              SizedBox(
+                height: 10.h,
+              ),
+              GestureDetector(
+                onTap: () {
+                  Get.toNamed(Routers.videoLogDetailPage);
+                },
+                child: Stack(
+                  children: [
+                    timelineData.imagesUrl!.isNotEmpty
+                        ? Image.network(
+                            timelineData.imagesUrl!,
+                            width: 260.w,
+                            height: 260.h,
+                          )
+                        : Container(),
+                    Positioned(
+                      top: 150.h,
+                      left: 10.w,
+                      child: Image(
+                        image: const AssetImage(
+                            'images/main/icon_lockLog_play.png'),
+                        width: 24.w,
+                        height: 20.w,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              SizedBox(
+                height: 20.h,
+              ),
+            ],
+          ),
+        );
+      },
     );
   }
 

star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_state.dart

@@ -17,31 +17,38 @@ class DoorLockLogState {
     DateTime(2024, 10, 10),
   ];
 
-  final startDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day).millisecondsSinceEpoch.obs;
+  final startDate =
-  final endDate = (DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1).subtract(const Duration(milliseconds: 1))).millisecondsSinceEpoch.obs;
+      DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day)
+          .millisecondsSinceEpoch
+          .obs;
+  final endDate = (DateTime(
+              DateTime.now().year, DateTime.now().month, DateTime.now().day + 1)
+          .subtract(const Duration(milliseconds: 1)))
+      .millisecondsSinceEpoch
+      .obs;
 
-  var dropdownTitle = '全部事件'.obs;
+  var dropdownTitle = '全部事件'.tr.obs;
   var dropdownValue = XSConstantMacro.lockEventTypeAll.obs;
 
   List<DropDownItem> getDropDownItemList = [
     DropDownItem(
-        itemTitle: "全部事件",
+        itemTitle: "全部事件".tr,
         itemValue: XSConstantMacro.lockEventTypeAll.toString(),
         isCheked: false),
     DropDownItem(
-        itemTitle: "开锁事件",
+        itemTitle: "开锁事件".tr,
         itemValue: XSConstantMacro.lockEventTypeOpenDoor.toString(),
         isCheked: false),
     DropDownItem(
-        itemTitle: "异常事件",
+        itemTitle: "异常事件".tr,
         itemValue: XSConstantMacro.lockEventTypeAbnormal.toString(),
         isCheked: false),
     DropDownItem(
-        itemTitle: "门铃事件",
+        itemTitle: "门铃事件".tr,
         itemValue: XSConstantMacro.lockEventTypeDoorbell.toString(),
         isCheked: false),
     DropDownItem(
-        itemTitle: "视频事件",
+        itemTitle: "视频事件".tr,
         itemValue: XSConstantMacro.lockEventTypeVideo.toString(),
         isCheked: false),
   ];
@@ -50,6 +57,7 @@ class DoorLockLogState {
   var operateDate = 0; // 按日期查询消息记录的时间戳
   var ifHaveNext = false; // 页码
   var logCountPage = 10; // 蓝牙记录一页多少个
+  var currentSelectDate = DateTime.now().obs; // 当前选择的日期
 
   DoorLockLogState() {
     keyInfos.value = Get.arguments["keyInfo"];

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_logic.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_state.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart';
+import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/showCupertinoAlertView.dart';
@@ -135,16 +137,32 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
   Future<void> checkRealNameStatus(int realNameAuthStatus) async {
     //打开实名认证 必须输入身份证号和真实姓名
     if (realNameAuthStatus == 1) {
-      if (state.getRealName.value.isEmpty ||
+      AdvancedFunctionRecordEntity entity = await ApiRepository.to.keyCheckFace(
-          state.getIDCardNumber.value.isEmpty) {
+        lockId: CommonDataManage().currentKeyInfo.lockId ?? 0,
-        ShowCupertinoAlertView()
+      );
-            .showOpenAuthWithIDCardInfoAlert((idCard, realName) {
+      if (entity.errorCode!.codeIsSuccessful) {
-          state.getIDCardNumber.value = idCard ?? '';
+        if (state.getRealName.value.isEmpty ||
-          state.getRealName.value = realName ?? '';
+            state.getIDCardNumber.value.isEmpty) {
+          ShowCupertinoAlertView()
+              .showOpenAuthWithIDCardInfoAlert((idCard, realName) {
+            state.getIDCardNumber.value = idCard ?? '';
+            state.getRealName.value = realName ?? '';
+            updateRealNameInfoWithAuthStatus(realNameAuthStatus);
+          });
+        } else {
           updateRealNameInfoWithAuthStatus(realNameAuthStatus);
-        });
+        }
-      } else {
+      } else if (entity.errorCode == 432) {
-        updateRealNameInfoWithAuthStatus(realNameAuthStatus);
+        //432--余量不足，需购买
+        ShowCupertinoAlertView().showBuyTipWithContentAlert(
+            titleStr: '实名认证为付费功能，请购买后再使用'.tr,
+            sureClick: () {
+              Get.toNamed(Routers.advancedFeaturesWebPage,
+                  arguments: {'isShop': false});
+            });
+      } else if (entity.errorCode == 433) {
+        //需联系管理员购买
+        ShowCupertinoAlertView().showContactAdministratorBuyAlert();
       }
     } else {
       updateRealNameInfoWithAuthStatus(realNameAuthStatus);
@@ -231,17 +249,23 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
     var textList = <String>[];
     if (CommonDataManage().currentKeyInfo.keyRight == 1) {
       textList = [
-        state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr
+        state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen
+            ? '取消冻结'.tr
+            : "冻结".tr
       ];
     } else if (CommonDataManage().currentKeyInfo.isLockOwner == 1) {
       if (state.keyType.value == 1 || state.keyType.value == 2) {
         textList = [
-          state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr,
+          state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen
+              ? '取消冻结'.tr
+              : "冻结".tr,
           state.itemData.value.keyRight == 1 ? '取消授权'.tr : '授权'.tr
         ];
       } else if (state.keyType.value == 4) {
         textList = [
-          state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen ? '取消冻结'.tr : "冻结".tr
+          state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen
+              ? '取消冻结'.tr
+              : "冻结".tr
         ];
       }
     }
@@ -256,7 +280,8 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
             chooseCallback: (value) {
               int index = value;
               if (index == 0) {
-                if (state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen) {
+                if (state.itemData.value.keyStatus ==
+                    XSConstantMacro.keyStatusFrozen) {
                   // 取消冻结
                   if (state.itemData.value.keyRight == 1) {
                     // 管理员
@@ -336,13 +361,36 @@ class ElectronicKeyDetailLogic extends BaseGetXController {
     return currentController;
   }
 
-  noModificationAllowedDuringFreeze(){
+  noModificationAllowedDuringFreeze() {
-    if(state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen){
+    if (state.itemData.value.keyStatus == XSConstantMacro.keyStatusFrozen) {
       showToast("冻结状态下不允许修改钥匙权限".tr);
       return;
     }
   }
 
+  //检测实名认证是否支持开启
+  Future<void> keyCheckFace() async {
+    AdvancedFunctionRecordEntity entity = await ApiRepository.to.keyCheckFace(
+      lockId: CommonDataManage().currentKeyInfo.lockId ?? 0,
+    );
+    if (entity.errorCode!.codeIsSuccessful) {
+      //打开实名认证，需要弹出输入身份证信息框
+      state.isRequireAuth.value = true;
+      state.isRealNameAuth.value = true;
+    } else if (entity.errorCode == 432) {
+      //432--余量不足，需购买
+      ShowCupertinoAlertView().showBuyTipWithContentAlert(
+          titleStr: '实名认证为付费功能，请购买后再使用'.tr,
+          sureClick: () {
+            Get.toNamed(Routers.advancedFeaturesWebPage,
+                arguments: {'isShop': false});
+          });
+    } else if (entity.errorCode == 433) {
+      //需联系管理员购买
+      ShowCupertinoAlertView().showContactAdministratorBuyAlert();
+    }
+  }
+
   @override
   void onReady() {
     // TODO: implement onReady

star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_state.dart

@@ -24,6 +24,7 @@ class ElectronicKeyDetailState {
   var isRealNameAuth = false.obs; //是否实名认证 0:不需要 1:需要
   var getRealName = ''.obs; //真实姓名
   var getIDCardNumber = ''.obs; //身份证号
+  var isRequireAuth = false.obs; //是否必须输入身份信息
 
   ElectronicKeyDetailState() {
     Map map = Get.arguments;

star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart

@@ -48,8 +48,7 @@ class LockEscalationLogic extends BaseGetXController {
 
   //手动升级
   Future<void> otaUpdate() async {
-    var status = await PermissionDialog.request(
+    var status = await PermissionDialog.requestStorage();
-        Permission.storage, '需要访问读写权限才能使用手动升级固件'.tr);
     if (status != true) {
       return;
     }
@@ -69,8 +68,7 @@ class LockEscalationLogic extends BaseGetXController {
     }
     String md5Str = md5.convert(otaBin!).toString();
     headJson!['fwMd5'] = md5Str;
-    ShowTipView().showIosTipWithContentDialog("未避免异常情况，请在门打开时升级".tr,
+    ShowTipView().showIosTipWithContentDialog("未避免异常情况，请在门打开时升级".tr, () async {
-        () async {
       blueOTAUpgrade(headJson!, [0, 0, 0, 0]);
       EasyLoading.show(
           status: '设备连接中...'.tr, maskType: EasyLoadingMaskType.black);

star_lock/lib/main/lockDetail/messageWarn/msgNotification/openDoorNotify/openDoorNotify_page.dart

@@ -72,7 +72,7 @@ class _OpenDoorNotifyPageState extends State<OpenDoorNotifyPage> {
         alignment: Alignment.centerLeft,
         margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w),
         child: Text(
-          '若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择'.tr,
+          '若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择。'.tr,
           style: TextStyle(color: AppColors.darkGrayTextColor, fontSize: 20.sp),
         ));
   }

star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart

@@ -431,8 +431,7 @@ class NearbyLockLogic extends BaseGetXController {
 
   //手动升级
   Future<void> otaUpdate() async {
-    var status = await PermissionDialog.request(
+    var status = await PermissionDialog.requestStorage();
-        Permission.storage, '需要访问读写权限才能使用手动升级固件'.tr);
     if (status != true) {
       return;
     }

star_lock/lib/tools/advancedCalendar/src/header.dart

@@ -15,8 +15,7 @@ class Header extends StatelessWidget {
     this.todayStyle,
   }) : super(key: key);
 
-  static final _dateFormatter = DateFormat().add_yMMMM();
+  static final _dateFormatter = DateFormat.yM('zh_CN');
-  // static final _dateFormatter = DateFormat('MM月dd日', 'zh_CN');
   final DateTime monthDate;
   final EdgeInsetsGeometry margin;
   final VoidCallback? onPressed;

star_lock/lib/tools/advancedCalendar/src/widget.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:intl/date_symbol_data_local.dart';

star_lock/lib/tools/showCupertinoAlertView.dart

@@ -364,4 +364,36 @@ class ShowCupertinoAlertView {
       },
     );
   }
+
+  //清空操作记录弹窗
+  void showClearOperationRecordAlert({required Function clearClick}) {
+    showCupertinoDialog(
+      context: Get.context!,
+      builder: (context) {
+        return CupertinoAlertDialog(
+          title: Text('是否要删除操作记录？'.tr),
+          content: Text('被删除的记录不能恢复'.tr),
+          actions: [
+            CupertinoDialogAction(
+              child: Text(
+                '取消'.tr,
+                style: TextStyle(color: AppColors.mainColor),
+              ),
+              onPressed: () {
+                Get.back();
+              },
+            ),
+            CupertinoDialogAction(
+              child:
+                  Text('删除'.tr, style: TextStyle(color: AppColors.mainColor)),
+              onPressed: () {
+                Get.back();
+                clearClick();
+              },
+            ),
+          ],
+        );
+      },
+    );
+  }
 }

star_lock/lib/widget/permission/permission_dialog.dart

@@ -32,14 +32,30 @@ class PermissionDialog {
       return false;
     }
     bool application = true;
-    Map<Permission, PermissionStatus> statuses = await [
+    List<Permission> permissions = [
+      Permission.bluetooth,
       Permission.bluetoothScan,
       Permission.bluetoothConnect,
-    ].request();
+    ];
+    Future<bool> getPermissionStatus(List<Permission> permissions) async {
+      bool isGranted = true;
+      List<PermissionStatus> permissionStatus = [];
+      for (Permission per in permissions) {
+        permissionStatus.add(await per.status);
+      }
+      for (PermissionStatus per in permissionStatus) {
+        isGranted = isGranted && per.isGranted;
+      }
+      if (GetPlatform.isIOS) {
+        isGranted = permissionStatus[0].isGranted;
+      }
+      return isGranted;
+    }
+
     Permission permission = Permission.bluetoothScan;
     dynamic cache = await Storage.getString(titles[permission]);
-    bool isGranted = statuses.values.every((element) => element.isGranted);
+    bool isGranted = await getPermissionStatus(permissions);
-    if (AppPlatform.isAndroid && !isGranted && cache is! String) {
+    if (GetPlatform.isAndroid && !isGranted && cache is! String) {
       application = await showCupertinoDialog(
         context: Get.context!,
         builder: (context) {
@@ -69,16 +85,19 @@ class PermissionDialog {
       if (application) {
         await Storage.setString(titles[permission], titles[permission]);
       }
-    } else if (cache is String) {
+    } else if (cache is! String) {
-      bool isDenied = statuses.values.every((element) => element.isDenied);
+      await Storage.setString(titles[permission], titles[permission]);
-      if (isDenied) {
+    } else {
+      bool isGranted = await getPermissionStatus(permissions);
+      if (!isGranted) {
         showSet(permission);
         return false;
       }
     }
     if (application) {
-      PermissionStatus status = await permission.request();
+      await permissions.request();
-      return status.isGranted;
+      bool isGranted = await getPermissionStatus(permissions);
+      return isGranted;
     }
     return false;
   }
@@ -171,6 +190,98 @@ class PermissionDialog {
     return false;
   }
 
+  //读写
+  static Future<bool> requestStorage() async {
+    if (Get.context == null) {
+      return false;
+    }
+    bool isAndroid33 =
+        AppPlatform.isAndroid && AppPlatform.getSdkIntValue() >= 33;
+
+    //通用的局部函数
+    List<Permission> requestPermission() {
+      List<Permission> permissions;
+      if (isAndroid33) {
+        permissions = [
+          Permission.mediaLibrary,
+          Permission.photos,
+          // Permission.audio,
+          Permission.videos,
+          Permission.manageExternalStorage,
+        ];
+      } else {
+        permissions = [
+          Permission.storage,
+        ];
+      }
+      return permissions;
+    }
+
+    Future<bool> permissionStatus(List<Permission> permissions) async {
+      bool isGranted = true;
+      for (Permission permission in permissions) {
+        isGranted =
+            isGranted && (await permission.status) == PermissionStatus.granted;
+      }
+      if (isAndroid33) {
+        // android 33以上需要申请媒体库权限
+        isGranted = (await Permission.mediaLibrary.status) ==
+                PermissionStatus.granted ||
+            (await Permission.manageExternalStorage.status) ==
+                PermissionStatus.granted;
+      }
+      return isGranted;
+    }
+
+    bool application = true;
+    Permission permission = Permission.photos;
+    List<Permission> permissions = requestPermission();
+    dynamic cache = await Storage.getString(titles[permission]);
+    bool isGranted = await permissionStatus(permissions);
+    if (AppPlatform.isAndroid && !isGranted && cache is! String) {
+      application = await showCupertinoDialog(
+        context: Get.context!,
+        builder: (context) {
+          return PopScope(
+              canPop: false,
+              child: CupertinoAlertDialog(
+                title: Text('${'申请'.tr}${titles[permission] ?? ''}${'权限'.tr}'),
+                content: Text('需要访问读写权限才能使用手动升级固件'.tr),
+                actions: [
+                  CupertinoDialogAction(
+                    child: Text('不允许'.tr),
+                    onPressed: () {
+                      Get.back(result: false);
+                    },
+                  ),
+                  CupertinoDialogAction(
+                    child: Text('允许'.tr),
+                    onPressed: () {
+                      Get.back(result: true);
+                    },
+                  ),
+                ],
+              ));
+        },
+      );
+      if (application) {
+        await Storage.setString(titles[permission], titles[permission]);
+      }
+    } else if (cache is String) {
+      bool isDenied = !(await permissionStatus(permissions));
+      if (isDenied) {
+        showSet(permission);
+        return false;
+      }
+    }
+    if (application) {
+      Map<Permission, PermissionStatus> statuses = await permissions.request();
+      bool isGranted = await permissionStatus(statuses.keys.toList());
+      return isGranted;
+    }
+    return false;
+  }
+
   //显示权限判断申请框
   static Future<bool> request(Permission permission, [String? content]) async {
     if (Get.context == null) {