feat:修改电子钥匙循环页面 bug

2024-05-04 18:17:22 +08:00 · 2024-05-04 18:17:22 +08:00 · 987fbe2ffa
commit 987fbe2ffa
parent c2cb7218ee
3 changed files with 236 additions and 216 deletions
--- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart
@ -40,21 +40,21 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
    switch (type) {
      case '0':
        // 限时
-        if (state.timeLimitBeginTime.value.isEmpty) {
+        if (state.timeLimitBeginTime.isEmpty) {
          showToast("请选择开始时间".tr);
          return;
        }
-        if (state.timeLimitEndTime.value.isEmpty) {
+        if (state.timeLimitEndTime.isEmpty) {
          showToast("请选择结束时间".tr);
          return;
        }

        typeValue = XSConstantMacro.keyTypeTime;
        startDate = DateTool()
-            .dateToTimestamp(state.timeLimitBeginTime.value, 1)
+            .dateToTimestamp(state.timeLimitBeginTime, 1)
            .toString();
        endDate = DateTool()
-            .dateToTimestamp(state.timeLimitEndTime.value, 1)
+            .dateToTimestamp(state.timeLimitEndTime, 1)
            .toString();
        startTime = "0";
        endTime = "0";
@ -73,20 +73,20 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
        break;
      case '3':
        typeValue = XSConstantMacro.keyTypeLoop;
-        if (state.cycleBeginTime.value.isEmpty) {
+        if (state.cycleBeginTime.isEmpty) {
          showToast("请选择有效期".tr);
          return;
        }
        startDate = DateTool()
-            .dateToTimestamp(state.cycleBeginTime.value, 1)
+            .dateToTimestamp(state.cycleBeginTime, 1)
            .toString();
        endDate =
-            DateTool().dateToTimestamp(state.cycleEndTime.value, 1).toString();
+            DateTool().dateToTimestamp(state.cycleEndTime, 1).toString();
        startTime = DateTool()
-            .dateToTimestamp(state.effectiveDateTime.value, 0)
+            .dateToTimestamp(state.effectiveDateTime, 0)
            .toString();
        endTime = DateTool()
-            .dateToTimestamp(state.failureDateTime.value, 0)
+            .dateToTimestamp(state.failureDateTime, 0)
            .toString();
        break;
      default:
@ -96,15 +96,15 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
    String getKeyType = typeValue.toString();

    var entity = await ApiRepository.to.sendElectronicKey(
-        createUser: state.isCreateUser.value == true ? "1" : "0",
-        countryCode: state.countryCode.value,
+        createUser: state.isCreateUser == true ? "1" : "0",
+        countryCode: state.countryCode,
        usernameType: isPhoneNumber(state.emailOrPhoneController.text) == true
            ? '1'
            : '2',
        endDate: int.parse(endDate),
-        faceAuthentication: state.isAuthentication.value == true ? '1' : '2',
+        faceAuthentication: state.isAuthentication == true ? '1' : '2',
        isCameraEnable: '2',
-        isRemoteUnlock: state.isRemoteUnlock.value == true ? '1' : '2',
+        isRemoteUnlock: state.isRemoteUnlock == true ? '1' : '2',
        keyNameForAdmin: state.keyNameController.text,
        keyRight: '0',
        keyType: getKeyType,
@ -118,13 +118,15 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
        endTime: int.parse(endTime),
        isOnlyManageSelf: 0);
    if (entity.errorCode!.codeIsSuccessful) {
-      state.isSendSuccess.value = true;
+      state.isSendSuccess = true;
      resetData();
+      update();
      eventBus.fire(ElectronicKeyListRefreshUI());
    } else {
      if (entity.errorCode == 425) {
        //用户未注册
-        state.isCreateUser.value = true;
+        state.isCreateUser = true;
+        update();
        ShowTipView().showIosTipWithContentDialog(
            '${"是否发送电子钥匙给未注册账号".tr}\n${state.emailOrPhoneController.text}', () {
          sendElectronicKeyRequest();
@ -151,14 +153,15 @@ class SendElectronicKeyViewLogic extends BaseGetXController {
    state.keyNameController.text = "";
    state.timeLimitBeginTime = DateTool()
        .dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString())
-        .obs; // 限时开始时间
+        ; // 限时开始时间
    state.timeLimitEndTime = DateTool()
        .dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString())
-        .obs; // 限时结束时间
-    state.cycleBeginTime = "".obs; // 循环开始时间
-    state.cycleEndTime = "".obs; // 循环结束时间
-    state.effectiveDateTime = "".obs; // 生效时间
-    state.failureDateTime = "".obs; // 失效时间
-    state.weekdaysList = [].obs;
+        ; // 限时结束时间
+    state.cycleBeginTime = ""; // 循环开始时间
+    state.cycleEndTime = ""; // 循环结束时间
+    state.effectiveDateTime = ""; // 生效时间
+    state.failureDateTime = ""; // 失效时间
+    state.weekdaysList = [];
+    update();
  }
 }
--- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
@ -38,8 +38,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
        tag: widget.type,
        init: SendElectronicKeyViewLogic(widget.type),
        builder: (SendElectronicKeyViewLogic logic) {
-          return Obx(() {
-            if (logic.state.isSendSuccess.value == true) {
+          if (logic.state.isSendSuccess == true) {
            return sendElectronicKeySucceed(logic);
          } else {
            switch (widget.type) {
@ -98,7 +97,6 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
            }
          }
        });
-        });
  }

  // 顶部钥匙信息widget
@ -123,7 +121,7 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
          isHaveRightWidget: true,
          isHaveDirection: true,
          rightWidget: Text(
-            '${logic.state.countryName.value} +${logic.state.countryCode.value}',
+            '${logic.state.countryName} +${logic.state.countryCode}',
            textAlign: TextAlign.end,
            style:
            TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
@ -133,8 +131,9 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
                context, Routers.selectCountryRegionPage);
            if (result != null) {
              result as Map<String, dynamic>;
-              logic.state.countryCode.value = result['code'];
-              logic.state.countryName.value = result['countryName'];
+              logic.state.countryCode = result['code'];
+              logic.state.countryName = result['countryName'];
+              logic.update();
            }
          },
        ),
@ -153,33 +152,39 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
  Widget keyTimeWidget(SendElectronicKeyViewLogic logic) {
    return Column(
      children: [
-        Obx(() => CommonItem(
+        CommonItem(
            leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
-            rightTitle: logic.state.timeLimitBeginTime.value,
+            rightTitle: logic.state.timeLimitBeginTime,
            isHaveLine: true,
            isHaveDirection: true,
            action: () {
              PDuration selectDate = PDuration.parse(
-                  DateTime.parse(logic.state.timeLimitBeginTime.value));
+                  DateTime.parse(logic.state.timeLimitBeginTime));
              Pickers.showDatePicker(context,
-                  selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) {
-                logic.state.timeLimitBeginTime.value =
+                  selectDate: selectDate,
+                  mode: DateMode.YMDHM,
+                  onConfirm: (p) {
+                    logic.state.timeLimitBeginTime =
                        DateTool().getYMDHNDateString(p, 1);
+                    logic.update();
                  });
-            })),
-        Obx(() => CommonItem(
+            }),
+        CommonItem(
            leftTitel: TranslationLoader.lanKeys!.failureTime!.tr,
-            rightTitle: logic.state.timeLimitEndTime.value,
+            rightTitle: logic.state.timeLimitEndTime,
            isHaveDirection: true,
            action: () {
              PDuration selectDate = PDuration.parse(
-                  DateTime.tryParse(logic.state.timeLimitEndTime.value));
+                  DateTime.tryParse(logic.state.timeLimitEndTime));
              Pickers.showDatePicker(context,
-                  selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) {
-                logic.state.timeLimitEndTime.value =
+                  selectDate: selectDate,
+                  mode: DateMode.YMDHM,
+                  onConfirm: (p) {
+                    logic.state.timeLimitEndTime =
                        DateTool().getYMDHNDateString(p, 1);
+                    logic.update();
                  });
-            })),
+            }),
        Container(height: 10.h),
      ],
    );
@ -195,7 +200,8 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
          isTipsImg: true,
          tipsImgAction: () {
            ShowTipView().showSureAlertDialog(
-                "人脸实名认证指的是用户在使用手机APP开锁时，需要先进行本人人脸验证，验证通过才能开锁。".tr);
+                "人脸实名认证指的是用户在使用手机APP开锁时，需要先进行本人人脸验证，验证通过才能开锁。"
+                    .tr);
          },
          isHaveRightWidget: true,
          rightWidget: SizedBox(
@ -209,30 +215,32 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
  Widget keyPeriodValidityWidget(SendElectronicKeyViewLogic logic) {
    return Column(
      children: [
-        Obx(() => CommonItem(
+        CommonItem(
            leftTitel: TranslationLoader.lanKeys!.periodValidity!.tr,
            rightTitle:
-                "${logic.state.cycleBeginTime.value}\n${logic.state.cycleEndTime.value}",
+            "${logic.state.cycleBeginTime}\n${logic.state.cycleEndTime}",
            isHaveDirection: true,
            isHaveLine: true,
            action: () async {
              var result =
-                  await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: {
+              await Get.toNamed(
+                  Routers.seletKeyCyclicDatePage, arguments: {
                'validityValue': logic.state.weekdaysList,
-                'starDate': logic.state.cycleBeginTime.value,
-                'endDate': logic.state.cycleEndTime.value,
-                'starTime': logic.state.effectiveDateTime.value,
-                'endTime': logic.state.failureDateTime.value
+                'starDate': logic.state.cycleBeginTime,
+                'endDate': logic.state.cycleEndTime,
+                'starTime': logic.state.effectiveDateTime,
+                'endTime': logic.state.failureDateTime
              });
              if (result != null && result.isNotEmpty) {
-                logic.state.weekdaysList.value = result['validityValue'];
-                logic.state.cycleBeginTime.value = result['starDate'];
-                logic.state.cycleEndTime.value = result['endDate'];
-                logic.state.effectiveDateTime.value = result['starTime'];
-                logic.state.failureDateTime.value = result['endTime'];
+                logic.state.weekdaysList = result['validityValue'];
+                logic.state.cycleBeginTime = result['starDate'];
+                logic.state.cycleEndTime = result['endDate'];
+                logic.state.effectiveDateTime = result['starTime'];
+                logic.state.failureDateTime = result['endTime'];
+                logic.update();
              }
-            })),
-        Obx(() => Visibility(
+            }),
+        Visibility(
            visible: logic.state.weekdaysList.isNotEmpty ? true : false,
            child: CommonItem(
                leftTitel: "有效日".tr,
@ -240,58 +248,66 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
                isHaveDirection: true,
                isHaveLine: true,
                action: () async {
-                  var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
+                  var result = await Get.toNamed(
+                      Routers.seletKeyCyclicDatePage,
                      arguments: {
                        'validityValue': logic.state.weekdaysList,
-                        'starDate': logic.state.cycleBeginTime.value,
-                        'endDate': logic.state.cycleEndTime.value,
-                        'starTime': logic.state.effectiveDateTime.value,
-                        'endTime': logic.state.failureDateTime.value
+                        'starDate': logic.state.cycleBeginTime,
+                        'endDate': logic.state.cycleEndTime,
+                        'starTime': logic.state.effectiveDateTime,
+                        'endTime': logic.state.failureDateTime
                      });
                  if (result != null && result.isNotEmpty) {
-                    logic.state.weekdaysList.value = result['validityValue'];
-                    logic.state.cycleBeginTime.value = result['starDate'];
-                    logic.state.cycleEndTime.value = result['endDate'];
-                    logic.state.effectiveDateTime.value = result['starTime'];
-                    logic.state.failureDateTime.value = result['endTime'];
+                    logic.state.weekdaysList =
+                    result['validityValue'];
+                    logic.state.cycleBeginTime = result['starDate'];
+                    logic.state.cycleEndTime = result['endDate'];
+                    logic.state.effectiveDateTime =
+                    result['starTime'];
+                    logic.state.failureDateTime = result['endTime'];
+                    logic.update();
                  }
-                }))),
-        Obx(() => Visibility(
-            visible: logic.state.effectiveDateTime.value.isNotEmpty,
+                })),
+        Visibility(
+            visible: logic.state.effectiveDateTime.isNotEmpty,
            child: CommonItem(
                leftTitel: "有效时间".tr,
                rightTitle:
-                    "${logic.state.effectiveDateTime.value}-${logic.state.failureDateTime.value}",
+                "${logic.state.effectiveDateTime}-${logic.state
+                    .failureDateTime}",
                isHaveDirection: true,
                action: () async {
-                  var result = await Get.toNamed(Routers.seletKeyCyclicDatePage,
+                  var result = await Get.toNamed(
+                      Routers.seletKeyCyclicDatePage,
                      arguments: {
                        'validityValue': logic.state.weekdaysList,
-                        'starDate': logic.state.cycleBeginTime.value,
-                        'endDate': logic.state.cycleEndTime.value,
-                        'starTime': logic.state.effectiveDateTime.value,
-                        'endTime': logic.state.failureDateTime.value
+                        'starDate': logic.state.cycleBeginTime,
+                        'endDate': logic.state.cycleEndTime,
+                        'starTime': logic.state.effectiveDateTime,
+                        'endTime': logic.state.failureDateTime
                      });
                  if (result != null && result.isNotEmpty) {
-                    logic.state.weekdaysList.value = result['validityValue'];
-                    logic.state.cycleBeginTime.value = result['starDate'];
-                    logic.state.cycleEndTime.value = result['endDate'];
-                    logic.state.effectiveDateTime.value = result['starTime'];
-                    logic.state.failureDateTime.value = result['endTime'];
+                    logic.state.weekdaysList =
+                    result['validityValue'];
+                    logic.state.cycleBeginTime = result['starDate'];
+                    logic.state.cycleEndTime = result['endDate'];
+                    logic.state.effectiveDateTime =
+                    result['starTime'];
+                    logic.state.failureDateTime = result['endTime'];
+                    logic.update();
                  }
-                }))),
+                })),
      ],
    );
  }

-  Widget keyBottomWidget(
-      String sendElectronicKeyTips, SendElectronicKeyViewLogic logic) {
+  Widget keyBottomWidget(String sendElectronicKeyTips,
+      SendElectronicKeyViewLogic logic) {
    return Column(
      children: [
        Container(
          padding: EdgeInsets.all(20.w),
          child: Row(
-            // crossAxisAlignment: CrossAxisAlignment.start,
            children: [
              Expanded(
                  child: Text(
@ -316,7 +332,6 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
            }),
        Container(
          padding: EdgeInsets.only(right: 30.w),
-          // color: Colors.red,
          child: Row(
            mainAxisAlignment: MainAxisAlignment.end,
            children: [
@ -384,8 +399,9 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
        SubmitBtn(
            btnName: '完成'.tr,
            onClick: () {
-              logic.state.isSendSuccess.value = false;
+              logic.state.isSendSuccess = false;
              logic.resetData();
+              logic.update();
            }),
        SizedBox(
          height: 10.h,
@ -519,22 +535,22 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
  }

  //isRemote true:远程开锁  false:实名认证
-  CupertinoSwitch _remoteSwitch(
-      bool isRemote, SendElectronicKeyViewLogic logic) {
+  CupertinoSwitch _remoteSwitch(bool isRemote,
+      SendElectronicKeyViewLogic logic) {
    return CupertinoSwitch(
      activeColor: CupertinoColors.activeBlue,
      trackColor: CupertinoColors.systemGrey5,
      thumbColor: CupertinoColors.white,
      value: isRemote
-          ? logic.state.isRemoteUnlock.value
-          : logic.state.isAuthentication.value,
+          ? logic.state.isRemoteUnlock
+          : logic.state.isAuthentication,
      onChanged: (value) {
        if (isRemote) {
-          logic.state.isRemoteUnlock.value = !logic.state.isRemoteUnlock.value;
+          logic.state.isRemoteUnlock = !logic.state.isRemoteUnlock;
        } else {
-          logic.state.isAuthentication.value =
-              !logic.state.isAuthentication.value;
-          if (logic.state.isAuthentication.value) {
+          logic.state.isAuthentication =
+          !logic.state.isAuthentication;
+          if (logic.state.isAuthentication) {
            ShowTipView().showBuyTipWithContentAlert(
                titleStr: '实名认证为付费功能，请购买后再使用'.tr,
                sureClick: () {
@ -594,8 +610,8 @@ class _SendElectronicKeyViewState extends State<SendElectronicKeyView>
    return widgetList;
  }

-  GestureDetector buildCenter3(
-      String imageName, String titleStr, int itemIndex) {
+  GestureDetector buildCenter3(String imageName, String titleStr,
+      int itemIndex) {
    return GestureDetector(
      child: Container(
        width: 120.w,
--- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart
@ -3,34 +3,35 @@ import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart
 import 'package:get/get.dart';
 import 'package:star_lock/tools/dateTool.dart';

-
 class SendElectronicKeyViewState {
-  TextEditingController emailOrPhoneController = TextEditingController(); //邮箱/手机号输入框
+  TextEditingController emailOrPhoneController =
+      TextEditingController(); //邮箱/手机号输入框
  TextEditingController keyNameController = TextEditingController(); //钥匙名输入框

  final FlutterContactPicker contactPicker = FlutterContactPicker();
  late Contact contact;

-  final isRemoteUnlock = false.obs; //是否允许远程开锁
-  final isAuthentication = false.obs; //是否可以实名认证
+  bool isRemoteUnlock = false; //是否允许远程开锁
+  bool isAuthentication = false; //是否可以实名认证

-  var timeLimitBeginTime = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString()).obs;// 限时开始时间
-  var timeLimitEndTime = DateTool().dateToYMDHNString(DateTime.now().millisecondsSinceEpoch.toString()).obs;// 限时结束时间
-  var cycleBeginTime = "".obs;// 循环开始时间
-  var cycleEndTime = "".obs;// 循环结束时间
-  var effectiveDateTime = "".obs;// 生效时间
-  var failureDateTime = "".obs;// 失效时间
-  var weekdaysList = [].obs;
+  var timeLimitBeginTime = DateTool().dateToYMDHNString(
+      DateTime.now().millisecondsSinceEpoch.toString()); // 限时开始时间
+  var timeLimitEndTime = DateTool().dateToYMDHNString(
+      DateTime.now().millisecondsSinceEpoch.toString()); // 限时结束时间
+  var cycleBeginTime = ""; // 循环开始时间
+  var cycleEndTime = ""; // 循环结束时间
+  var effectiveDateTime = ""; // 生效时间
+  var failureDateTime = ""; // 失效时间
+  var weekdaysList = [];

-  var isSendSuccess = false.obs;
-  var countryName = '中国'.tr.obs;
-  var countryCode = '86'.obs;
-  var isCreateUser = false.obs; //用户未注册时传1 已注册传0
+  var isSendSuccess = false;
+  var countryName = '中国'.tr;
+  var countryCode = '86';
+  var isCreateUser = false; //用户未注册时传1 已注册传0
  var isDemoMode = false;

  final timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时
  final permanentTips = '接收者可以使用此App开关锁'; //永久
  final onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'; //单次
  final cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'; //循环
-
 }