1，新增检测是否支持开启实名认证接口对接

2，发送电子钥匙根据数据新增键入真实姓名和身份证号
3，编辑锁分组页面新增高级功能相应权限及开通处理

star_lock/images/lan/lan_en.json

@@ -795,5 +795,9 @@
   "当前剩余数量":"Current surplus quantity",
   "购买":"Buy",
   "实名认证为付费功能，请购买后再使用":"Real-name authentication is a paid function, please use it after purchase",
-  "密码不一致哦":"The passwords are inconsistent"
+  "密码不一致哦":"The passwords are inconsistent",
+  "真实姓名":"Real name",
+  "身份证号":"ID number",
+  "请输入真实姓名":"Please enter your real name",
+  "请输入身份证号":"Please enter your ID number"
 }

star_lock/images/lan/lan_keys.json

@@ -822,5 +822,9 @@
   "实名认证":"实名认证",
   "当前剩余数量":"当前剩余数量",
   "购买":"购买",
-  "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用"
+  "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用",
+  "真实姓名":"真实姓名",
+  "身份证号":"身份证号",
+  "请输入真实姓名":"请输入真实姓名",
+  "请输入身份证号":"请输入身份证号"
 }

star_lock/images/lan/lan_zh.json

@@ -825,5 +825,9 @@
   "实名认证":"实名认证",
   "当前剩余数量":"当前剩余数量",
   "购买":"购买",
-  "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用"
+  "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用",
+  "真实姓名":"真实姓名",
+  "身份证号":"身份证号",
+  "请输入真实姓名":"请输入真实姓名",
+  "请输入身份证号":"请输入身份证号"
 }

star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart

@@ -1,10 +1,8 @@
-
 import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
-import 'package:star_lock/blue/io_type.dart';
 import 'package:star_lock/tools/dateTool.dart';
 
 import '../../../../blue/blue_manage.dart';
@@ -117,7 +115,8 @@ class AuthorizedAdminLogic extends BaseGetXController {
     if (state.seletType.value == 0) {
       getKeyType = "2";
 
-      startDate = DateTool().dateToTimestamp(state.beginDate.value, 1).toString();
+      startDate =
+          DateTool().dateToTimestamp(state.beginDate.value, 1).toString();
       endDate = DateTool().dateToTimestamp(state.endDate.value, 1).toString();
       startTime = "0";
       endTime = "0";
@@ -156,7 +155,9 @@ class AuthorizedAdminLogic extends BaseGetXController {
         weekDays: state.weekdaysList,
         startTime: int.parse(startTime),
         endTime: int.parse(endTime),
-        isOnlyManageSelf: state.onlyManageYouCreatesUser.value ? 1 : 0);
+        isOnlyManageSelf: state.onlyManageYouCreatesUser.value ? 1 : 0,
+        realName: '',
+        idCardNumber: '');
     if (entity.errorCode!.codeIsSuccessful) {
       state.isCreateUser.value = false;
       state.isSendSuccess.value = true;
@@ -169,7 +170,9 @@ class AuthorizedAdminLogic extends BaseGetXController {
         //用户未注册
         state.isCreateUser.value = true;
         // _showDialog('${entity.errorMsg}');
-        ShowTipView().showIosTipWithContentDialog('${"是否发送授权管理员给未注册账号".tr}\n${state.emailOrPhoneController.text}', (){
+        ShowTipView().showIosTipWithContentDialog(
+            '${"是否发送授权管理员给未注册账号".tr}\n${state.emailOrPhoneController.text}',
+            () {
           sendElectronicKeyRequest();
         });
       }

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart

@@ -1,14 +1,5 @@
-import 'package:get/get.dart';
-import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart';
-import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart';
-import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/commonDataManage.dart';
-import 'package:star_lock/tools/dateTool.dart';
-import 'package:star_lock/tools/eventBusEventManage.dart';
-
-import '../../../../../tools/showTipView.dart';
 
 class SendElectronicKeyLogic extends BaseGetXController {
   final SendElectronicKeyState state = SendElectronicKeyState();

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart

@@ -1,28 +1,11 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.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/app_settings/app_colors.dart';
-import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_logic.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart';
-import 'package:star_lock/network/api_repository.dart';
-import 'package:star_lock/tools/baseGetXController.dart';
-import 'package:star_lock/tools/pickers/pickers.dart';
-import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
-import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
-import 'package:star_lock/tools/showTipView.dart';
-import 'package:star_lock/tools/storage.dart';
 
-import '../../../../../appRouters.dart';
 import '../../../../../tools/CustomUnderlineTabIndicator.dart';
-import '../../../../../tools/NativeInteractionTool.dart';
-import '../../../../../tools/commonDataManage.dart';
-import '../../../../../tools/commonItem.dart';
-import '../../../../../tools/dateTool.dart';
-import '../../../../../tools/submitBtn.dart';
 import '../../../../../tools/titleAppBar.dart';
 import '../../../../../translations/trans_lib.dart';
 
@@ -119,7 +102,6 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage>
     ItemView(title: TranslationLoader.lanKeys!.once!.tr, type: "2"),
     ItemView(title: TranslationLoader.lanKeys!.circulation!.tr, type: "3"),
   ];
-
 }
 
 class ItemView {

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart

@@ -1,27 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
-import 'package:get/get.dart';
-
-import '../../../../../tools/dateTool.dart';
-import '../../../../lockMian/entity/lockListInfo_entity.dart';
 
 class SendElectronicKeyState {
-
   late TabController tabController;
 
   final FlutterContactPicker contactPicker = FlutterContactPicker();
   late Contact contact;
 
-
   final timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时
   final permanentTips = '接收者可以使用此App开关锁'; //永久
   final onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'; //单次
   final cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'; //循环
 
-  SendElectronicKeyState() {
+  SendElectronicKeyState() {}
-    // Map map = Get.arguments;
-    // if ((map["keyInfo"] != null)) {
-    //   keyInfo.value = map["keyInfo"];
-    // }
-  }
 }

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart

@@ -1,7 +1,9 @@
+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/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.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/commonDataManage.dart';
@@ -50,12 +52,10 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
         }
 
         typeValue = XSConstantMacro.keyTypeTime;
-        startDate = DateTool()
+        startDate =
-            .dateToTimestamp(state.timeLimitBeginTime, 1)
+            DateTool().dateToTimestamp(state.timeLimitBeginTime, 1).toString();
-            .toString();
+        endDate =
-        endDate = DateTool()
+            DateTool().dateToTimestamp(state.timeLimitEndTime, 1).toString();
-            .dateToTimestamp(state.timeLimitEndTime, 1)
-            .toString();
         startTime = "0";
         endTime = "0";
 
@@ -77,17 +77,13 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
           showToast("请选择有效期".tr);
           return;
         }
-        startDate = DateTool()
+        startDate =
-            .dateToTimestamp(state.cycleBeginTime, 1)
+            DateTool().dateToTimestamp(state.cycleBeginTime, 1).toString();
-            .toString();
+        endDate = DateTool().dateToTimestamp(state.cycleEndTime, 1).toString();
-        endDate =
+        startTime =
-            DateTool().dateToTimestamp(state.cycleEndTime, 1).toString();
+            DateTool().dateToTimestamp(state.effectiveDateTime, 0).toString();
-        startTime = DateTool()
+        endTime =
-            .dateToTimestamp(state.effectiveDateTime, 0)
+            DateTool().dateToTimestamp(state.failureDateTime, 0).toString();
-            .toString();
-        endTime = DateTool()
-            .dateToTimestamp(state.failureDateTime, 0)
-            .toString();
         break;
       default:
         typeValue = XSConstantMacro.keyTypeTime;
@@ -116,7 +112,13 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
         weekDays: state.weekdaysList,
         startTime: int.parse(startTime),
         endTime: int.parse(endTime),
-        isOnlyManageSelf: 0);
+        isOnlyManageSelf: 0,
+        realName: state.isRequireAuth.value == true
+            ? state.realNameController.text
+            : "",
+        idCardNumber: state.isRequireAuth.value == true
+            ? state.idCardController.text
+            : "");
     if (entity.errorCode!.codeIsSuccessful) {
       state.isSendSuccess = true;
       resetData();
@@ -135,6 +137,24 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
     }
   }
 
+  //检测实名认证是否支持开启
+  Future<void> keyCheckFace() async {
+    AdvancedFunctionRecordEntity entity = await ApiRepository.to.keyCheckFace(
+        countryCode: int.parse(state.countryCode),
+        account: state.emailOrPhoneController.text);
+    if (entity.errorCode!.codeIsSuccessful) {
+      ShowTipView().showBuyTipWithContentAlert(
+          titleStr: '实名认证为付费功能，请购买后再使用'.tr,
+          sureClick: () {
+            Get.toNamed(Routers.advancedFeaturesWebPage,
+                arguments: {'isShop': false});
+          });
+    } else if (entity.errorCode! == 431) {
+      //431代表改用户没有身份证信息，需要弹出输入身份证信息框
+      state.isRequireAuth.value = true;
+    }
+  }
+
   bool isPhoneNumber(String input) {
     // 手机号正则表达式，这里简化为11位数字
     final RegExp phoneRegExp = RegExp(r'^\d{11}$');
@@ -148,15 +168,33 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
     return emailRegExp.hasMatch(input);
   }
 
+  TextEditingController getCurrentController(int lineIndex) {
+    TextEditingController currentController = TextEditingController();
+    switch (lineIndex) {
+      case 1:
+        currentController = state.emailOrPhoneController;
+        break;
+      case 2:
+        currentController = state.keyNameController;
+        break;
+      case 3:
+        currentController = state.realNameController;
+        break;
+      case 4:
+        currentController = state.idCardController;
+        break;
+      default:
+    }
+    return currentController;
+  }
+
   void resetData() {
     state.emailOrPhoneController.text = "";
     state.keyNameController.text = "";
-    state.timeLimitBeginTime = DateTool()
+    state.timeLimitBeginTime = DateTool().dateToYMDHNString(
-        .dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString())
+        DateTime.now().millisecondsSinceEpoch.toString()); // 限时开始时间
-        ; // 限时开始时间
+    state.timeLimitEndTime = DateTool().dateToYMDHNString(
-    state.timeLimitEndTime = DateTool()
+        DateTime.now().millisecondsSinceEpoch.toString()); // 限时结束时间
-        .dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString())
-        ; // 限时结束时间
     state.cycleBeginTime = ""; // 循环开始时间
     state.cycleEndTime = ""; // 循环结束时间
     state.effectiveDateTime = ""; // 生效时间

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart

@@ -17,7 +17,6 @@ import 'package:star_lock/tools/pickers/pickers.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
 import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
 import 'package:star_lock/tools/showTipView.dart';
-import 'package:star_lock/tools/storage.dart';
 import 'package:star_lock/tools/submitBtn.dart';
 import 'package:star_lock/translations/trans_lib.dart';
 
@@ -34,6 +33,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
     with AutomaticKeepAliveClientMixin {
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return GetBuilder<SendElectronicKeyViewLogic>(
         tag: widget.type,
         init: SendElectronicKeyViewLogic(widget.type),
@@ -161,9 +161,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
               PDuration selectDate = PDuration.parse(
                   DateTime.parse(logic.state.timeLimitBeginTime));
               Pickers.showDatePicker(context,
-                  selectDate: selectDate,
+                  selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) {
-                  mode: DateMode.YMDHM,
-                  onConfirm: (p) {
                 logic.state.timeLimitBeginTime =
                     DateTool().getYMDHNDateString(p, 1);
                 logic.update();
@@ -177,9 +175,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
               PDuration selectDate = PDuration.parse(
                   DateTime.tryParse(logic.state.timeLimitEndTime));
               Pickers.showDatePicker(context,
-                  selectDate: selectDate,
+                  selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) {
-                  mode: DateMode.YMDHM,
-                  onConfirm: (p) {
                 logic.state.timeLimitEndTime =
                     DateTool().getYMDHNDateString(p, 1);
                 logic.update();
@@ -194,19 +190,37 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
   Widget keyRealNameWidget(SendElectronicKeyViewLogic logic) {
     return Column(
       children: [
-        CommonItem(
+        Obx(() => CommonItem(
               leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr,
               rightTitle: "",
               isTipsImg: true,
+              isHaveLine:
+                  logic.state.isRequireAuth.value == true ? true : false,
               tipsImgAction: () {
                 ShowTipView().showSureAlertDialog(
-                "人脸实名认证指的是用户在使用手机APP开锁时，需要先进行本人人脸验证，验证通过才能开锁。"
+                    "人脸实名认证指的是用户在使用手机APP开锁时，需要先进行本人人脸验证，验证通过才能开锁。".tr);
-                    .tr);
               },
               isHaveRightWidget: true,
               rightWidget: SizedBox(
-              width: 60.w, height: 50.h, child: _remoteSwitch(false, logic)),
+                  width: 60.w,
-        ),
+                  height: 50.h,
+                  child: _remoteSwitch(false, logic)),
+            )),
+        Obx(() => Visibility(
+            visible: logic.state.isRequireAuth.value,
+            child: CommonItem(
+                leftTitel: '真实姓名'.tr,
+                rightTitle: "",
+                isHaveRightWidget: true,
+                isHaveLine: true,
+                rightWidget: getTFWidget(false, '请输入真实姓名'.tr, 3, logic)))),
+        Obx(() => Visibility(
+            visible: logic.state.isRequireAuth.value,
+            child: CommonItem(
+                leftTitel: '身份证号'.tr,
+                rightTitle: "",
+                isHaveRightWidget: true,
+                rightWidget: getTFWidget(false, '请输入身份证号'.tr, 4, logic)))),
       ],
     );
   }
@@ -223,8 +237,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
             isHaveLine: true,
             action: () async {
               var result =
-              await Get.toNamed(
+                  await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: {
-                  Routers.seletKeyCyclicDatePage, arguments: {
                 'validityValue': logic.state.weekdaysList,
                 'starDate': logic.state.cycleBeginTime,
                 'endDate': logic.state.cycleEndTime,
@@ -248,8 +261,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
                 isHaveDirection: true,
                 isHaveLine: true,
                 action: () async {
-                  var result = await Get.toNamed(
+                  var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
-                      Routers.seletKeyCyclicDatePage,
                       arguments: {
                         'validityValue': logic.state.weekdaysList,
                         'starDate': logic.state.cycleBeginTime,
@@ -258,12 +270,10 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
                         'endTime': logic.state.failureDateTime
                       });
                   if (result != null && result.isNotEmpty) {
-                    logic.state.weekdaysList =
+                    logic.state.weekdaysList = result['validityValue'];
-                    result['validityValue'];
                     logic.state.cycleBeginTime = result['starDate'];
                     logic.state.cycleEndTime = result['endDate'];
-                    logic.state.effectiveDateTime =
+                    logic.state.effectiveDateTime = result['starTime'];
-                    result['starTime'];
                     logic.state.failureDateTime = result['endTime'];
                     logic.update();
                   }
@@ -273,12 +283,10 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
             child: CommonItem(
                 leftTitel: "有效时间".tr,
                 rightTitle:
-                "${logic.state.effectiveDateTime}-${logic.state
+                    "${logic.state.effectiveDateTime}-${logic.state.failureDateTime}",
-                    .failureDateTime}",
                 isHaveDirection: true,
                 action: () async {
-                  var result = await Get.toNamed(
+                  var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
-                      Routers.seletKeyCyclicDatePage,
                       arguments: {
                         'validityValue': logic.state.weekdaysList,
                         'starDate': logic.state.cycleBeginTime,
@@ -287,12 +295,10 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
                         'endTime': logic.state.failureDateTime
                       });
                   if (result != null && result.isNotEmpty) {
-                    logic.state.weekdaysList =
+                    logic.state.weekdaysList = result['validityValue'];
-                    result['validityValue'];
                     logic.state.cycleBeginTime = result['starDate'];
                     logic.state.cycleEndTime = result['endDate'];
-                    logic.state.effectiveDateTime =
+                    logic.state.effectiveDateTime = result['starTime'];
-                    result['starTime'];
                     logic.state.failureDateTime = result['endTime'];
                     logic.update();
                   }
@@ -301,8 +307,8 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
     );
   }
 
-  Widget keyBottomWidget(String sendElectronicKeyTips,
+  Widget keyBottomWidget(
-      SendElectronicKeyViewLogic logic) {
+      String sendElectronicKeyTips, SendElectronicKeyViewLogic logic) {
     return Column(
       children: [
         Container(
@@ -440,9 +446,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
         children: [
           Expanded(
             child: TextField(
-              controller: lineIndex == 1
+              controller: logic.getCurrentController(lineIndex),
-                  ? logic.state.emailOrPhoneController
-                  : logic.state.keyNameController,
               //输入框一行
               maxLines: 1,
               inputFormatters: <TextInputFormatter>[
@@ -535,28 +539,23 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
   }
 
   //isRemote true:远程开锁  false:实名认证
-  CupertinoSwitch _remoteSwitch(bool isRemote,
+  CupertinoSwitch _remoteSwitch(
-      SendElectronicKeyViewLogic logic) {
+      bool isRemote, SendElectronicKeyViewLogic logic) {
     return CupertinoSwitch(
       activeColor: CupertinoColors.activeBlue,
       trackColor: CupertinoColors.systemGrey5,
       thumbColor: CupertinoColors.white,
-      value: isRemote
+      value:
-          ? logic.state.isRemoteUnlock
+          isRemote ? logic.state.isRemoteUnlock : logic.state.isAuthentication,
-          : logic.state.isAuthentication,
       onChanged: (value) {
         if (isRemote) {
           logic.state.isRemoteUnlock = !logic.state.isRemoteUnlock;
         } else {
-          logic.state.isAuthentication =
+          logic.state.isAuthentication = !logic.state.isAuthentication;
-          !logic.state.isAuthentication;
           if (logic.state.isAuthentication) {
-            ShowTipView().showBuyTipWithContentAlert(
+            logic.keyCheckFace();
-                titleStr: '实名认证为付费功能，请购买后再使用'.tr,
+          } else {
-                sureClick: () {
+            logic.state.isRequireAuth.value = false;
-                  Get.toNamed(Routers.advancedFeaturesWebPage,
-                      arguments: {'isShop': false});
-                });
           }
         }
       },
@@ -610,8 +609,8 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
     return widgetList;
   }
 
-  GestureDetector buildCenter3(String imageName, String titleStr,
+  GestureDetector buildCenter3(
-      int itemIndex) {
+      String imageName, String titleStr, int itemIndex) {
     return GestureDetector(
       child: Container(
         width: 120.w,

star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart

@@ -7,6 +7,8 @@ class SendElectronicKeyViewState {
   TextEditingController emailOrPhoneController =
       TextEditingController(); //邮箱/手机号输入框
   TextEditingController keyNameController = TextEditingController(); //钥匙名输入框
+  TextEditingController realNameController = TextEditingController(); //真实姓名输入框
+  TextEditingController idCardController = TextEditingController(); //身份证号输入框
 
   final FlutterContactPicker contactPicker = FlutterContactPicker();
   late Contact contact;
@@ -29,6 +31,7 @@ class SendElectronicKeyViewState {
   var countryCode = '86';
   var isCreateUser = false; //用户未注册时传1 已注册传0
   var isDemoMode = false;
+  var isRequireAuth = false.obs; //是否需要实名认证的必填项
 
   final timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时
   final permanentTips = '接收者可以使用此App开关锁'; //永久

star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_logic.dart

@@ -1,5 +1,5 @@
-
 import 'package:get/get.dart';
+import 'package:star_lock/tools/storage.dart';
 
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
@@ -16,8 +16,7 @@ class GroupEditLockLogic extends BaseGetXController {
       return;
     }
     var entity = await ApiRepository.to.lockGroupAddLock(
-        lockIds: lockIds,
+        lockIds: lockIds, groupId: state.selectGroupListItem.keyGroupId!);
-        groupId: state.selectGroupListItem.keyGroupId!);
     if (entity.errorCode!.codeIsSuccessful) {
       showToast("添加成功");
       eventBus.fire(LockGroupEditGroupLockRefreshEvent());
@@ -41,4 +40,11 @@ class GroupEditLockLogic extends BaseGetXController {
     }
   }
 
+  @override
+  onReady() async {
+    super.onReady();
+
+    var isVip = await Storage.getBool(saveIsVip);
+    state.isVip.value = isVip ?? false;
+  }
 }

star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_page.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
+import 'package:star_lock/tools/advancedFunctionHandle.dart';
 import 'package:star_lock/tools/noData.dart';
 
 import '../../../../../../app_settings/app_colors.dart';
@@ -26,21 +27,34 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
     return Scaffold(
         backgroundColor: AppColors.mainBackgroundColor,
         appBar: TitleAppBar(
-            barTitle: state.type == 0 ? TranslationLoader.lanKeys!.add!.tr : TranslationLoader.lanKeys!.delete!.tr,
+            barTitle: state.type == 0
+                ? TranslationLoader.lanKeys!.add!.tr
+                : TranslationLoader.lanKeys!.delete!.tr,
             haveBack: true,
             backgroundColor: AppColors.mainColor),
         body: Column(
           children: [
+            Obx(() => Visibility(
+                visible: state.isVip.value ? false : true,
+                child: AdvancedFunctionHandle()
+                    .topTipsAdvancedFeatures('开通高级功能后才可以对锁进行管理'.tr))),
             Container(
               margin: EdgeInsets.all(15.w),
               child: Row(
                 children: [
-                  Text(TranslationLoader.lanKeys!.selectTheLockToJoinTheGroup!.tr, style: TextStyle(fontSize: 25.sp)),
+                  Text(
+                      TranslationLoader
+                          .lanKeys!.selectTheLockToJoinTheGroup!.tr,
+                      style: TextStyle(fontSize: 25.sp)),
                 ],
               ),
             ),
             Expanded(child: _buildMainUI()),
-            SubmitBtn(btnName: TranslationLoader.lanKeys!.sure!.tr, onClick: () async {
+            Obx(() => Visibility(
+                visible: state.isVip.value ? true : false,
+                child: SubmitBtn(
+                    btnName: TranslationLoader.lanKeys!.sure!.tr,
+                    onClick: () async {
                       var idList = [];
                       for (int i = 0; i < state.lockList.length; i++) {
                         LockListItem lockListItem = state.lockList[i];
@@ -55,7 +69,7 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
                         // 删除
                         logic.lockGroupDeletLock(idList);
                       }
-            }),
+                    }))),
             SizedBox(height: 20.h)
           ],
         ));
@@ -75,12 +89,16 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
                 color: AppColors.greyLineColor,
               );
             },
-    ) : NoData();
+          )
+        : NoData();
   }
 
   Widget _listItemView(LockListItem itemData) {
     return GestureDetector(
       onTap: () {
+        if (!state.isVip.value) {
+          return;
+        }
         setState(() {
           itemData.isChecked = !itemData.isChecked;
         });
@@ -92,9 +110,18 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            SizedBox(width: 20.w,),
+            SizedBox(
-            Image.asset('images/icon_lockGroup_item.png', width: 36, height: 36, fit: BoxFit.fill,),
+              width: 20.w,
-            SizedBox(width: 10.w,),
+            ),
+            Image.asset(
+              'images/icon_lockGroup_item.png',
+              width: 36,
+              height: 36,
+              fit: BoxFit.fill,
+            ),
+            SizedBox(
+              width: 10.w,
+            ),
             Text(
               itemData.lockAlias ?? '',
               style: TextStyle(fontSize: 24.sp),
@@ -113,5 +140,4 @@ class _GroupEditLockPageState extends State<GroupEditLockPage> {
       ),
     );
   }
-
 }

star_lock/lib/mine/mineSet/lockGroup/groupEditLock/groupEditLock_state.dart

@@ -1,4 +1,3 @@
-
 import 'package:get/get.dart';
 import '../../../../main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendLockGroupListEntity.dart';
 
@@ -7,6 +6,8 @@ class GroupEditLockState {
   var type = 0; // 0添加 1删除
   var selectGroupListItem = GroupListItem();
   var ungrouped = GroupListItem();
+  var isVip = false.obs;
+
   GroupEditLockState() {
     Map map = Get.arguments;
     type = map["type"];

star_lock/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart

@@ -43,12 +43,17 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
                 // 处理操作按钮的点击事件-添加锁分组
                 state.changeNameController.text = "";
                 // showCupertinoAlertDialog(context, true, 0);
-                ShowTipView().showTFViewAlertDialog(state.changeNameController, TranslationLoader.lanKeys!.createNewGroup!.tr, TranslationLoader.lanKeys!.pleaseEnter!.tr, (){
+                ShowTipView().showTFViewAlertDialog(
+                    state.changeNameController,
+                    TranslationLoader.lanKeys!.createNewGroup!.tr,
+                    TranslationLoader.lanKeys!.pleaseEnter!.tr, () {
                   //发送编辑钥匙名称请求
                   if (state.changeNameController.text.isNotEmpty) {
+                    Navigator.of(context).pop();
                     logic.addLockGroupRequest();
                   } else {
-                    logic.showToast(TranslationLoader.lanKeys!.pleaseEnterAGroupName!.tr);
+                    logic.showToast(
+                        TranslationLoader.lanKeys!.pleaseEnterAGroupName!.tr);
                   }
                 });
               },
@@ -57,7 +62,10 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
           backgroundColor: AppColors.mainColor),
       body: Column(
         children: [
-          Expanded(child: Obx(() => state.itemDataList.value.isEmpty ? NoData(): _buildMainUI())),
+          Expanded(
+              child: Obx(() => state.itemDataList.value.isEmpty
+                  ? NoData()
+                  : _buildMainUI())),
         ],
       ),
     );
@@ -98,10 +106,12 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
               return LeftSlideActions(
                 key: Key(itemData.keyGroupId!.toString()),
                 actionsWidth: itemData.groupType != 0 ? 200.w : 0,
-                actions: itemData.groupType != 0 ? [
+                actions: itemData.groupType != 0
+                    ? [
                         _buildEditBtn(itemData),
                         _buildDeleteBtn(itemData),
-                ] : [],
+                      ]
+                    : [],
                 decoration: const BoxDecoration(
                   borderRadius: BorderRadius.all(Radius.circular(1)),
                 ),
@@ -111,8 +121,10 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
                     rightTitle: "",
                     allHeight: 70.h,
                     action: () {
-
+                      Get.toNamed(Routers.lockItemListPage, arguments: {
-                      Get.toNamed(Routers.lockItemListPage, arguments: {'groupListItem': itemData, "ungrouped": state.ungrouped});
+                        'groupListItem': itemData,
+                        "ungrouped": state.ungrouped
+                      });
                     }),
               );
             }
@@ -189,11 +201,15 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
         state.changeNameController.text = groupListItem.keyGroupName!;
         // showCupertinoAlertDialog(context, false,  groupListItem.keyGroupId!);
 
-        ShowTipView().showTFViewAlertDialog(state.changeNameController, TranslationLoader.lanKeys!.createNewGroup!.tr, TranslationLoader.lanKeys!.pleaseEnter!.tr, (){
+        ShowTipView().showTFViewAlertDialog(
+            state.changeNameController,
+            TranslationLoader.lanKeys!.createNewGroup!.tr,
+            TranslationLoader.lanKeys!.pleaseEnter!.tr, () {
           if (state.changeNameController.text.isNotEmpty) {
             logic.editLockGroupRequest(groupListItem.keyGroupId!);
           } else {
-            logic.showToast(TranslationLoader.lanKeys!.pleaseEnterAGroupName!.tr);
+            logic.showToast(
+                TranslationLoader.lanKeys!.pleaseEnterAGroupName!.tr);
           }
         });
       },
@@ -232,5 +248,4 @@ class _LockGroupListPageState extends State<LockGroupListPage> {
   //       }
   //   );
   // }
-
 }

star_lock/lib/network/api.dart

@@ -227,6 +227,5 @@ abstract class Api {
   final String deleteLockCloudStorageURL = '/lockCloudStorage/delete'; //删除云存
   final String getServiceUserPackageURL =
       '/v2/service/getUserPackage'; //获取增值服务用户余量包
-  final String isFaceAuthenticationURL =
+  final String isFaceAuthenticationURL = '/key/checkFace'; //检测实名认证是否支持开启
-      '/key/isFaceAuthentication'; //检测实名认证是否支持开启
 }

star_lock/lib/network/api_provider.dart

@@ -142,7 +142,9 @@ class ApiProvider extends BaseProvider {
           List weekDays,
           int startTime,
           int endTime,
-          int isOnlyManageSelf) =>
+          int isOnlyManageSelf,
+          String realName,
+          String idCardNumber) =>
       post(
           sendElectronicKeyURL.toUrl,
           jsonEncode({
@@ -165,6 +167,8 @@ class ApiProvider extends BaseProvider {
             'startTime': startTime,
             'endTime': endTime,
             'isOnlyManageSelf': isOnlyManageSelf,
+            'realName': realName,
+            'idCardNumber': idCardNumber
           }));
 
   Future<Response> uploadElectricQuantity(
@@ -2028,7 +2032,7 @@ class ApiProvider extends BaseProvider {
           }));
 
   // 检测实名认证是否支持开启
-  Future<Response> isFaceAuthentication(
+  Future<Response> keyCheckFace(
     int countryCode,
     String account,
   ) =>

star_lock/lib/network/api_repository.dart

@@ -179,7 +179,9 @@ class ApiRepository {
       required List weekDays,
       required int startTime,
       required int endTime,
-      required int isOnlyManageSelf}) async {
+      required int isOnlyManageSelf,
+      required String realName,
+      required String idCardNumber}) async {
     final res = await apiProvider.sendElectronicKey(
         createUser,
         countryCode,
@@ -199,7 +201,9 @@ class ApiRepository {
         weekDays,
         startTime,
         endTime,
-        isOnlyManageSelf);
+        isOnlyManageSelf,
+        realName,
+        idCardNumber);
     return AuthorizedAdminSendEntity.fromJson(res.body);
   }
 
@@ -2055,11 +2059,11 @@ class ApiRepository {
   }
 
   // 检测实名认证是否支持开启
-  Future<AdvancedFunctionRecordEntity> isFaceAuthentication({
+  Future<AdvancedFunctionRecordEntity> keyCheckFace({
     required int countryCode,
     required String account,
   }) async {
-    final res = await apiProvider.isFaceAuthentication(countryCode, account);
+    final res = await apiProvider.keyCheckFace(countryCode, account);
     return AdvancedFunctionRecordEntity.fromJson(res.body);
   }
 }