From e2c5066bec07ce605c44298537dc16fa156b097c Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Thu, 30 May 2024 18:22:31 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=9F=AD=E4=BF=A1/?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E3=80=81?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=202=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=92=A5=E5=8C=99=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorizedAdmin_logic.dart | 14 ++- .../authorizedAdmin_state.dart | 2 +- .../view/sendElectronicKeyView_logic.dart | 115 +++++++++--------- .../view/sendElectronicKeyView_page.dart | 40 +++--- .../view/sendElectronicKeyView_state.dart | 38 +++--- ...eAddedServicesNoteAndEmailDetail_page.dart | 10 +- .../value_added_services_record_logic.dart | 12 ++ .../value_added_services_record_page.dart | 7 +- lib/network/api_provider.dart | 2 +- lib/network/api_repository.dart | 2 +- 10 files changed, 134 insertions(+), 108 deletions(-) diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart index 23fb1943..6a42c878 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_logic.dart @@ -197,7 +197,7 @@ class AuthorizedAdminLogic extends BaseGetXController { required String endTime}) async { final AuthorizedAdminSendEntity entity = await ApiRepository.to .sendElectronicKey( - createUser: state.isCreateUser.value ? '1' : '0', + createUser: state.createUser.value, countryCode: state.countryCode.value, usernameType: '1', endDate: int.parse(endDate), @@ -224,18 +224,20 @@ class AuthorizedAdminLogic extends BaseGetXController { ? state.idCardController.text : ''); if (entity.errorCode!.codeIsSuccessful) { - state.isCreateUser.value = false; + state.createUser.value = 0; state.isSendSuccess.value = true; state.addUserId.value = entity.data!.receiverUser!.id.toString(); keyId = entity.data!.keyId; eventBus.fire(AuthorizedAdminPageRefreshUI()); } else { + //用户未注册 if (entity.errorCode == 425) { - //用户未注册 - state.isCreateUser.value = true; + update(); ShowTipView().showIosTipWithContentDialog( - '${"是否发送授权管理员给未注册账号".tr}\n${state.emailOrPhoneController.text}', - sendElectronicKeyRequest); + '${"是否发送电子钥匙给未注册账号".tr}\n${state.emailOrPhoneController.text}', () { + state.createUser.value = 1; + sendElectronicKeyRequest(); + }); } } } diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_state.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_state.dart index 36dceadf..2d6591d5 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_state.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_state.dart @@ -29,7 +29,7 @@ class AuthorizedAdminState { RxString countryName = '中国'.obs; RxString countryCode = '86'.obs; RxList weekdaysList = [].obs; - RxBool isCreateUser = false.obs; //用户未注册时传1 已注册传0 + RxInt createUser = 0.obs; //用户未注册时传1 已注册传0 RxInt seletType = 0.obs; String pwdShareStr = '您好，您的授权管理员生成成功'; diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart index f8b18cc5..d5974e16 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:get_storage/get_storage.dart'; import 'package:star_lock/appRouters.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; +import 'package:star_lock/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_entity.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'; @@ -16,40 +16,39 @@ import 'package:star_lock/tools/showTipView.dart'; import 'package:star_lock/tools/storage.dart'; class SendElectronicKeyViewLogic extends BaseGetXController { + SendElectronicKeyViewLogic(this.type); String type; final SendElectronicKeyViewState state = SendElectronicKeyViewState(); - SendElectronicKeyViewLogic(this.type); - @override void onInit() { super.onInit(); Storage.getBool(ifIsDemoModeOrNot) - .then((value) => state.isDemoMode = value ?? false); + .then((bool? value) => state.isDemoMode = value ?? false); } //发送钥匙请求 Future sendElectronicKeyRequest() async { if (state.emailOrPhoneController.text.isEmpty) { - showToast("请输入接收者账号".tr); + showToast('请输入接收者账号'.tr); return; } - var startDate = "0"; - var endDate = "0"; - var startTime = "0"; - var endTime = "0"; + var startDate = '0'; + var endDate = '0'; + var startTime = '0'; + var endTime = '0'; int typeValue; switch (type) { case '0': // 限时 if (state.timeLimitBeginTime.isEmpty) { - showToast("请选择开始时间".tr); + showToast('请选择开始时间'.tr); return; } if (state.timeLimitEndTime.isEmpty) { - showToast("请选择结束时间".tr); + showToast('请选择结束时间'.tr); return; } @@ -58,11 +57,11 @@ class SendElectronicKeyViewLogic extends BaseGetXController { DateTool().dateToTimestamp(state.timeLimitBeginTime, 1).toString(); endDate = DateTool().dateToTimestamp(state.timeLimitEndTime, 1).toString(); - startTime = "0"; - endTime = "0"; + startTime = '0'; + endTime = '0'; if (int.parse(startDate) >= int.parse(endDate)) { - showToast("失效时间要大于生效时间".tr); + showToast('失效时间要大于生效时间'.tr); return; } @@ -76,7 +75,7 @@ class SendElectronicKeyViewLogic extends BaseGetXController { case '3': typeValue = XSConstantMacro.keyTypeLoop; if (state.cycleBeginTime.isEmpty) { - showToast("请选择有效期".tr); + showToast('请选择有效期'.tr); return; } startDate = @@ -96,12 +95,12 @@ class SendElectronicKeyViewLogic extends BaseGetXController { //如果打开了实名认证，需要弹出输入身份证信息框 if (state.isAuthentication.value == true) { if (state.realNameController.text.isEmpty) { - showToast("请输入真实姓名".tr); + showToast('请输入真实姓名'.tr); return; } if (state.idCardController.text.isEmpty) { - showToast("请输入身份证号".tr); + showToast('请输入身份证号'.tr); return; } //弹出身份证信息确认框 @@ -137,37 +136,40 @@ class SendElectronicKeyViewLogic extends BaseGetXController { required int typeValue, required String getKeyType, }) async { - var entity = await ApiRepository.to.sendElectronicKey( - createUser: state.isCreateUser == true ? "1" : "0", - countryCode: state.countryCode, - usernameType: RegularExpression() - .isPhoneNumber(state.emailOrPhoneController.text) == - true - ? '1' - : '2', - endDate: int.parse(endDate), - faceAuthentication: state.isAuthentication.value == true ? '1' : '2', - isCameraEnable: '2', - isRemoteUnlock: state.isRemoteUnlock.value == true ? '1' : '2', - keyNameForAdmin: state.keyNameController.text, - keyRight: '0', - keyType: getKeyType, - lockId: CommonDataManage().currentKeyInfo.lockId.toString(), - operatorUid: '', - receiverUsername: state.emailOrPhoneController.text, - remarks: '', - startDate: int.parse(startDate), - weekDays: state.weekdaysList, - startTime: int.parse(startTime), - endTime: int.parse(endTime), - isOnlyManageSelf: 0, - realName: state.isRequireAuth.value == true - ? state.realNameController.text - : "", - idCardNumber: state.isRequireAuth.value == true - ? state.idCardController.text - : ""); + final AuthorizedAdminSendEntity entity = await ApiRepository.to + .sendElectronicKey( + createUser: state.createUser.value, + countryCode: state.countryCode, + usernameType: RegularExpression() + .isPhoneNumber(state.emailOrPhoneController.text) == + true + ? '1' + : '2', + endDate: int.parse(endDate), + faceAuthentication: + state.isAuthentication.value == true ? '1' : '2', + isCameraEnable: '2', + isRemoteUnlock: state.isRemoteUnlock.value == true ? '1' : '2', + keyNameForAdmin: state.keyNameController.text, + keyRight: '0', + keyType: getKeyType, + lockId: CommonDataManage().currentKeyInfo.lockId.toString(), + operatorUid: '', + receiverUsername: state.emailOrPhoneController.text, + remarks: '', + startDate: int.parse(startDate), + weekDays: state.weekdaysList, + startTime: int.parse(startTime), + endTime: int.parse(endTime), + isOnlyManageSelf: 0, + realName: state.isRequireAuth.value == true + ? state.realNameController.text + : '', + idCardNumber: state.isRequireAuth.value == true + ? state.idCardController.text + : ''); if (entity.errorCode!.codeIsSuccessful) { + state.createUser.value = 0; state.isSendSuccess = true; resetData(); update(); @@ -175,10 +177,10 @@ class SendElectronicKeyViewLogic extends BaseGetXController { } else { if (entity.errorCode == 425) { //用户未注册 - state.isCreateUser = true; update(); ShowTipView().showIosTipWithContentDialog( '${"是否发送电子钥匙给未注册账号".tr}\n${state.emailOrPhoneController.text}', () { + state.createUser.value = 1; sendElectronicKeyRequest(); }); } @@ -231,19 +233,20 @@ class SendElectronicKeyViewLogic extends BaseGetXController { } void resetData() { - state.emailOrPhoneController.text = ""; - state.keyNameController.text = ""; - state.realNameController.text = ""; - state.idCardController.text = ""; + state.emailOrPhoneController.text = ''; + state.keyNameController.text = ''; + state.realNameController.text = ''; + state.idCardController.text = ''; state.timeLimitBeginTime = DateTool().dateToYMDHNString( DateTime.now().millisecondsSinceEpoch.toString()); // 限时开始时间 state.timeLimitEndTime = DateTool().dateToYMDHNString( DateTime.now().millisecondsSinceEpoch.toString()); // 限时结束时间 - state.cycleBeginTime = ""; // 循环开始时间 - state.cycleEndTime = ""; // 循环结束时间 - state.effectiveDateTime = ""; // 生效时间 - state.failureDateTime = ""; // 失效时间 + state.cycleBeginTime = ''; // 循环开始时间 + state.cycleEndTime = ''; // 循环结束时间 + state.effectiveDateTime = ''; // 生效时间 + state.failureDateTime = ''; // 失效时间 state.weekdaysList = []; + state.createUser.value = 0; update(); } } diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart index 1973a050..40473e16 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart @@ -6,6 +6,7 @@ import 'package:get/get.dart'; import 'package:star_lock/appRouters.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/login/login/entity/LoginEntity.dart'; import 'package:star_lock/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_logic.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/NativeInteractionTool.dart'; @@ -127,7 +128,7 @@ class _SendElectronicKeyViewState extends State TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor), ), action: () async { - var result = await Navigator.pushNamed( + final result = await Navigator.pushNamed( context, Routers.selectCountryRegionPage); if (result != null) { result as Map; @@ -158,7 +159,7 @@ class _SendElectronicKeyViewState extends State isHaveLine: true, isHaveDirection: true, action: () { - PDuration selectDate = PDuration.parse( + final PDuration selectDate = PDuration.parse( DateTime.parse(logic.state.timeLimitBeginTime)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) { @@ -172,7 +173,7 @@ class _SendElectronicKeyViewState extends State rightTitle: logic.state.timeLimitEndTime, isHaveDirection: true, action: () { - PDuration selectDate = PDuration.parse( + final PDuration selectDate = PDuration.parse( DateTime.tryParse(logic.state.timeLimitEndTime)); Pickers.showDatePicker(context, selectDate: selectDate, mode: DateMode.YMDHM, onConfirm: (p) { @@ -194,8 +195,7 @@ class _SendElectronicKeyViewState extends State leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr, rightTitle: '', isTipsImg: true, - isHaveLine: - logic.state.isRequireAuth.value == true ? true : false, + isHaveLine: logic.state.isRequireAuth.value, tipsImgAction: () { ShowTipView().showSureAlertDialog( '人脸实名认证指的是用户在使用手机APP开锁时，需要先进行本人人脸验证，验证通过才能开锁。'.tr); @@ -236,7 +236,7 @@ class _SendElectronicKeyViewState extends State isHaveDirection: true, isHaveLine: true, action: () async { - var result = + final result = await Get.toNamed(Routers.seletKeyCyclicDatePage, arguments: { 'validityValue': logic.state.weekdaysList, 'starDate': logic.state.cycleBeginTime, @@ -254,15 +254,16 @@ class _SendElectronicKeyViewState extends State } }), Visibility( - visible: logic.state.weekdaysList.isNotEmpty ? true : false, + visible: logic.state.weekdaysList.isNotEmpty, child: CommonItem( leftTitel: '有效日'.tr, rightTitle: logic.state.weekdaysList.join(',').toString(), isHaveDirection: true, isHaveLine: true, action: () async { - var result = await Get.toNamed(Routers.seletKeyCyclicDatePage, - arguments: { + final result = await Get.toNamed( + Routers.seletKeyCyclicDatePage, + arguments: { 'validityValue': logic.state.weekdaysList, 'starDate': logic.state.cycleBeginTime, 'endDate': logic.state.cycleEndTime, @@ -287,7 +288,8 @@ class _SendElectronicKeyViewState extends State isHaveDirection: true, isHaveLine: true, action: () async { - var result = await Get.toNamed(Routers.seletKeyCyclicDatePage, + final result = await Get.toNamed( + Routers.seletKeyCyclicDatePage, arguments: { 'validityValue': logic.state.weekdaysList, 'starDate': logic.state.cycleBeginTime, @@ -367,7 +369,7 @@ class _SendElectronicKeyViewState extends State // 发送电子钥匙成功 Widget sendElectronicKeySucceed(SendElectronicKeyViewLogic logic) { return Column( - children: [ + children: [ Container( height: 250.h, width: 1.sw, @@ -428,7 +430,7 @@ class _SendElectronicKeyViewState extends State //标记房间为已入住 isOn:已入住: 1 空闲：2 Future updateRoomCheckIn(SendElectronicKeyViewLogic logic) async { - var entity = await ApiRepository.to.setRoomStatusData( + final LoginEntity entity = await ApiRepository.to.setRoomStatusData( lockId: CommonDataManage().currentKeyInfo.lockId!, roomStatus: 1, ); @@ -526,7 +528,7 @@ class _SendElectronicKeyViewState extends State ? true : false), child: Column( - children: [ + children: [ Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.remoteUnlockingAllowed!.tr, rightTitle: '', @@ -565,7 +567,7 @@ class _SendElectronicKeyViewState extends State ); } - Future _openModalBottomSheet() async { + Future _openModalBottomSheet() async { showModalBottomSheet( context: context, shape: RoundedRectangleBorder( @@ -604,7 +606,7 @@ class _SendElectronicKeyViewState extends State } List initBottomSheetList() { - List widgetList = []; + final List widgetList = []; widgetList.add(buildCenter3('images/icon_wechat.png', '微信好友'.tr, 0)); widgetList.add(buildCenter3('images/icon_message.png', '短信'.tr, 1)); widgetList.add(buildCenter3('images/icon_email.png', '邮件'.tr, 2)); @@ -643,17 +645,17 @@ class _SendElectronicKeyViewState extends State ); } - _jumpSmartDeviceRoute(int itemIndex) { + void _jumpSmartDeviceRoute(int itemIndex) { Get.back(); switch (itemIndex) { case 0: //微信好友 - String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; + final String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; NativeInteractionTool().loadNativeShare(shareText: pwdShareStr); break; case 1: //短信 - String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; + final String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; NativeInteractionTool().loadNativeShare(shareText: pwdShareStr); break; case 2: @@ -662,7 +664,7 @@ class _SendElectronicKeyViewState extends State break; case 3: //更多 - String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; + final String pwdShareStr = '您好，您的电子钥匙生成成功'.tr; NativeInteractionTool().loadNativeShare(shareText: pwdShareStr); break; default: diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart index 01ee2ec6..268c754c 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_state.dart @@ -13,28 +13,28 @@ class SendElectronicKeyViewState { final FlutterContactPicker contactPicker = FlutterContactPicker(); late Contact contact; - var isRemoteUnlock = false.obs; //是否允许远程开锁 - var isAuthentication = false.obs; //是否可以实名认证 + RxBool isRemoteUnlock = false.obs; //是否允许远程开锁 + RxBool isAuthentication = false.obs; //是否可以实名认证 - var timeLimitBeginTime = DateTool().dateToYMDHNString( + String timeLimitBeginTime = DateTool().dateToYMDHNString( DateTime.now().millisecondsSinceEpoch.toString()); // 限时开始时间 - var timeLimitEndTime = DateTool().dateToYMDHNString( + String timeLimitEndTime = DateTool().dateToYMDHNString( DateTime.now().millisecondsSinceEpoch.toString()); // 限时结束时间 - var cycleBeginTime = ""; // 循环开始时间 - var cycleEndTime = ""; // 循环结束时间 - var effectiveDateTime = ""; // 生效时间 - var failureDateTime = ""; // 失效时间 - var weekdaysList = []; + String cycleBeginTime = ''; // 循环开始时间 + String cycleEndTime = ''; // 循环结束时间 + String effectiveDateTime = ''; // 生效时间 + String failureDateTime = ''; // 失效时间 + List weekdaysList = []; - var isSendSuccess = false; - var countryName = '中国'.tr; - var countryCode = '86'; - var isCreateUser = false; //用户未注册时传1 已注册传0 - var isDemoMode = false; - var isRequireAuth = false.obs; //是否需要实名认证的必填项 + bool isSendSuccess = false; + String countryName = '中国'.tr; + String countryCode = '86'; + RxInt createUser = 0.obs; //用户未注册时传1 已注册传0 + bool isDemoMode = false; + RxBool isRequireAuth = false.obs; //是否需要实名认证的必填项 - final timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时 - final permanentTips = '接收者可以使用此App开关锁'; //永久 - final onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'; //单次 - final cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'; //循环 + final String timeLimitTips = '接收者在有效期内可以不限次数使用'; //限时 + final String permanentTips = '接收者可以使用此App开关锁'; //永久 + final String onceLimitTips = '单次钥匙有效期为1小时，只能使用一次'; //单次 + final String cycleLimitTips = '接收者可以在有效期内的固定时间段里，不限次数使用'; //循环 } diff --git a/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart b/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart index bfa7483f..005492cf 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart @@ -4,6 +4,7 @@ import 'package:get/get.dart'; import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_logic.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_state.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_arg.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; @@ -139,8 +140,13 @@ class _ValueAddedServicesNoteAndEmailDetailPageState ), GestureDetector( onTap: () { - Navigator.pushNamed(context, - Routers.valueAddedServicesBuyAndUseRecordManagePage); + if (type == 1) { + Get.toNamed(Routers.valueAddedServicesRecordPage, + arguments: UseRecordListArg.sms); + } else if (type == 2) { + Get.toNamed(Routers.valueAddedServicesRecordPage, + arguments: UseRecordListArg.email); + } }, child: Container( width: 90, diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart index c493bcb6..1f7bed72 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_logic.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:get/get.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFunctionRecord/advancedFunctionRecord_entity.dart'; +import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_arg.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/use_record_list_entity.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -58,6 +59,17 @@ class ValueAddedServicesRecordLogic extends BaseGetXController { } } + String getBuyRecordListTitle(RecordItem itemData) { + if (itemData.type == UseRecordListArg.sms['type']) { + return '${itemData.smsCount}条'; + } else if (itemData.type == UseRecordListArg.email['type']) { + return '${itemData.emailCount}封'; + } else if (itemData.type == UseRecordListArg.cloudauth['type']) { + return '实名认证/${itemData.cloudauthCount}次'; + } + return ''; + } + @override void onReady() { super.onReady(); diff --git a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart index f7e7eadf..dc641f9d 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRecord/value_added_services_record_page.dart @@ -89,14 +89,15 @@ class _PurchaseRecords extends StatelessWidget { ? ListView.builder( itemCount: buyRecordList.length, itemBuilder: (BuildContext context, int index) { - return _recordKeyItem(buyRecordList[index]); + return _recordKeyItem(buyRecordList[index], logic); }) : NoData(), ); }); } - Widget _recordKeyItem(RecordItem itemData) { + Widget _recordKeyItem( + RecordItem itemData, ValueAddedServicesRecordLogic logic) { return Container( color: Colors.white, margin: EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h), @@ -122,7 +123,7 @@ class _PurchaseRecords extends StatelessWidget { ], ), SizedBox(height: 8.h), - Text('实名认证/${itemData.cloudauthCount}次', + Text(logic.getBuyRecordListTitle(itemData), style: TextStyle( fontSize: 22.sp, color: AppColors.darkGrayTextColor)), ], diff --git a/lib/network/api_provider.dart b/lib/network/api_provider.dart index a162ddf7..b4668d0d 100755 --- a/lib/network/api_provider.dart +++ b/lib/network/api_provider.dart @@ -124,7 +124,7 @@ class ApiProvider extends BaseProvider { })); Future sendElectronicKey( - String createUser, + int createUser, String countryCode, String usernameType, int endDate, diff --git a/lib/network/api_repository.dart b/lib/network/api_repository.dart index dc880523..d93f0a74 100755 --- a/lib/network/api_repository.dart +++ b/lib/network/api_repository.dart @@ -167,7 +167,7 @@ class ApiRepository { //发送电子钥匙 Future sendElectronicKey( - {required String createUser, + {required int createUser, required String countryCode, required String usernameType, required int endDate,