From 6222675100a1f7517dbccffb2afdb081830d01cb Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Wed, 30 Aug 2023 17:24:01 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E7=94=B5=E5=AD=90=E9=92=A5=E5=8C=99?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9B=BF=E6=8D=A2=202?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=80=81=E9=92=A5=E5=8C=99=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electronicKeyList_page.dart | 80 ++++++++++++------- .../sendElectronicKey_page.dart | 21 +++-- .../lockDetail/lockDetail_page.dart | 6 +- 3 files changed, 72 insertions(+), 35 deletions(-) diff --git a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart index 990db641..dc9922c9 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; +import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/toast.dart'; @@ -23,36 +23,19 @@ class ElectronicKeyListPage extends StatefulWidget { class _ElectronicKeyListPageState extends State { final logic = Get.put(ElectronicKeyListLogic()); - - //请求电子钥匙列表 - Future> mockNetworkDataRequest() async { - ElectronicKeyListEntity entity = await ApiRepository.to - .electronicKeyList('0', '63', '0', '28', '1', '1', '20', '0', '0'); - if (entity.errorCode!.codeIsSuccessful) { - print("电子钥匙列表成功:${entity.data?.itemList}"); - } - if (entity.data != null) { - return entity.data!.itemList; - } else { - List dataList = []; - return dataList; - } - } - - //电子钥匙重置请求 - Future resetElectronicKeyListRequest() async { - ElectronicKeyListEntity entity = - await ApiRepository.to.resetElectronicKey('28', '0'); - if (entity.errorCode!.codeIsSuccessful) { - print("重置电子钥匙成功啦啦啦啦啦"); - Toast.show(msg: "重置成功"); - mockNetworkDataRequest(); - setState(() {}); - } - } + late KeyInfos keyInfo; + late LockMainEntity lockMainEntity; @override Widget build(BuildContext context) { + dynamic obj = ModalRoute.of(context)?.settings.arguments; + if (obj != null && (obj["lockMainEntity"] != null)) { + lockMainEntity = obj["lockMainEntity"]; + } + if (obj != null && (obj["keyInfo"] != null)) { + keyInfo = obj["keyInfo"]; + } + return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( @@ -95,7 +78,11 @@ class _ElectronicKeyListPageState extends State { btnName: TranslationLoader.lanKeys!.sendKey!.tr, onClick: () { Navigator.pushNamed( - context, Routers.sendElectronicKeyManagePage); + context, Routers.sendElectronicKeyManagePage, + arguments: { + "lockMainEntity": lockMainEntity, + "keyInfo": keyInfo + }); }, ), SizedBox( @@ -184,6 +171,41 @@ class _ElectronicKeyListPageState extends State { ); } + //请求电子钥匙列表 + Future> mockNetworkDataRequest() async { + ElectronicKeyListEntity entity = await ApiRepository.to.electronicKeyList( + '0', + keyInfo.keyId.toString(), + '', + keyInfo.lockId.toString(), + '', + '1', + '20', + '0', + keyInfo.keyRight.toString()); + if (entity.errorCode!.codeIsSuccessful) { + print("电子钥匙列表成功:${entity.data?.itemList}"); + } + if (entity.data != null) { + return entity.data!.itemList; + } else { + List dataList = []; + return dataList; + } + } + + //电子钥匙重置请求 + Future resetElectronicKeyListRequest() async { + ElectronicKeyListEntity entity = + await ApiRepository.to.resetElectronicKey('28', '0'); + if (entity.errorCode!.codeIsSuccessful) { + print("重置电子钥匙成功啦啦啦啦啦"); + Toast.show(msg: "重置成功"); + mockNetworkDataRequest(); + setState(() {}); + } + } + //使用期限 String getUseDateStr(ElectronicKeyListItem indexEntity) { String useDateStr = ''; diff --git a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart index 38eedfff..7ddc3431 100644 --- a/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart +++ b/star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart @@ -7,6 +7,7 @@ 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/lockMian/entity/lockInfoEntity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/toast.dart'; @@ -28,6 +29,8 @@ class SendElectronicKeyPage extends StatefulWidget { class _SendElectronicKeyPageState extends State { final FlutterContactPicker _contactPicker = FlutterContactPicker(); late Contact _contact; + late KeyInfos keyInfo; + late LockMainEntity lockMainEntity; // final logic = Get.put(SendElectronicKeyLogic()); // final state = Get.find().state; @@ -63,6 +66,14 @@ class _SendElectronicKeyPageState extends State { @override Widget build(BuildContext context) { + dynamic obj = ModalRoute.of(context)?.settings.arguments; + if (obj != null && (obj["lockMainEntity"] != null)) { + lockMainEntity = obj["lockMainEntity"]; + } + if (obj != null && (obj["keyInfo"] != null)) { + keyInfo = obj["keyInfo"]; + } + return SingleChildScrollView( child: indexChangeWidget(), ); @@ -323,7 +334,7 @@ class _SendElectronicKeyPageState extends State { Future sendElectronicKeyRequest() async { String getFailureDateTime = '0'; String getEffectiveDateTime = '0'; - String deviceID = '28'; + String lockID = keyInfo.lockId.toString(); String getKeyType = (int.parse(widget.type) + 1).toString(); if (widget.type == '0') { getFailureDateTime = @@ -341,12 +352,12 @@ class _SendElectronicKeyPageState extends State { '2', _isRemoteUnlock == true ? '1' : '2', keyNameController.text, - '1', + keyInfo.keyRight.toString(), getKeyType, - deviceID, - '小吴副号', + lockID, + '', emailOrPhoneController.text, - '0', + '', getEffectiveDateTime, weekdaysList); if (entity.errorCode!.codeIsSuccessful) { diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 564c1be3..0b3f40bd 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -174,7 +174,11 @@ class _LockDetailPageState extends State { }), bottomItem('images/main/icon_main_electronicKey.png', TranslationLoader.lanKeys!.electronicKey!.tr, () { - Navigator.pushNamed(context, Routers.electronicKeyListPage); + Navigator.pushNamed(context, Routers.electronicKeyListPage, + arguments: { + "lockMainEntity": widget.lockMainEntity, + "keyInfo": widget.keyInfo + }); }), bottomItem('images/main/icon_main_password.png', TranslationLoader.lanKeys!.password!.tr, () {