From 9232999c0d4ac6887e29c903ade7624335905133 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Mon, 24 Jul 2023 14:36:56 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84-?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E9=94=81=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97UI=202=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=91=E7=9A=84-=E8=AE=BE=E7=BD=AE-=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=A8=A1=E5=9D=97UI=203=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9commonItem=E7=9A=84line=E9=A2=9C=E8=89=B2=204?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84Switch=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 1 + star_lock/images/lan/lan_keys.json | 1 + star_lock/images/lan/lan_zh.json | 1 + star_lock/lib/appRouters.dart | 250 +++++++++++------- star_lock/lib/app_settings/app_colors.dart | 45 ++-- .../authorizedAdmin/authorizedAdmin_page.dart | 231 +++++++++++----- .../unlockQRCode/unlockQRCode_page.dart | 36 +-- .../authorizedAdministratorListPage.dart | 152 +++++++++++ .../lockUserManageListPage.dart | 163 ++++++++++++ star_lock/lib/mine/mineSet/mineSet_page.dart | 170 ++++++++---- star_lock/lib/tools/commonItem.dart | 65 +++-- star_lock/lib/translations/lanKeyEntity.dart | 73 ++--- 12 files changed, 875 insertions(+), 313 deletions(-) create mode 100644 star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorListPage.dart create mode 100644 star_lock/lib/mine/mineSet/lockUserManage/lockUserManageListPage.dart diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index c7afa5e9..398e0481 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -236,6 +236,7 @@ "problemTwo":"Problem Two", "problemThree":"Problem Three", "pleaseEnterYourAnswer":"Please Enter Your Answer", + "aboutToExpire":"About to expire", "designation": "designation", "state": "State", diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index f7ea8a77..833edfed 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -236,6 +236,7 @@ "problemTwo":"problemTwo", "problemThree":"problemThree", "pleaseEnterYourAnswer":"pleaseEnterYourAnswer", + "aboutToExpire":"About to expire", "designation": "designation", "state": "state", diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index a149fc17..bd462406 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -236,6 +236,7 @@ "problemTwo":"问题二", "problemThree":"问题三", "pleaseEnterYourAnswer":"请输入你的答案", + "aboutToExpire":"即将到期", "designation": "名称", "state": "状态", diff --git a/star_lock/lib/appRouters.dart b/star_lock/lib/appRouters.dart index 4d6223ea..6b0e6cc2 100644 --- a/star_lock/lib/appRouters.dart +++ b/star_lock/lib/appRouters.dart @@ -1,5 +1,6 @@ - +import 'package:flutter/material.dart'; import 'package:get/get.dart'; +import 'package:star_lock/mine/mineSet/lockUserManage/lockUserManageListPage.dart'; import 'package:star_lock/mine/mineSet/mineSet_page.dart'; import 'login/forgetPassword/starLock_forgetPassword_page.dart'; @@ -98,113 +99,154 @@ import 'mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedS import 'mine/valueAddedServices/valueAddedServicesRealName/valueAddedServicesRealName_page.dart'; import 'mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesAddSMSTemplate/valueAddedServicesAddSMSTemplate_page.dart'; import 'mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/valueAddedServicesListSMSTemplate_page.dart'; +import 'mine/mineSet/authorizedAdministrator/authorizedAdministratorListPage.dart'; import 'starLockApplication.dart'; abstract class Routers { - static const initial = '/';// 加载页 - static const starLockMain = '/StarLockMain';// 首页 - static const starLockMinePage = '/StarLockMinePage';// 我的 - static const seletLockTypePage = '/SeletLockTypePage';// 选择锁类型 - static const addLockPage = '/AddLockPage';// 选择锁类型 - static const nearbyLockPage = '/NearbyLockPage';// 附近的锁 - static const lockAddressPage = '/LockAddressPage';// 锁地址 - static const saveLockPage = '/SaveLockPage';// 保存锁 - static const lockDetailPage = '/LockDetailPage';// 锁详情 - static const electronicKeyListPage = '/ElectronicKeyListPage';// 电子钥匙列表 - static const electronicKeyDetailPage = '/ElectronicKeyDetailPage';// 电子钥匙详情 - static const electronicKeyDetailChangeDate = '/ElectronicKeyDetailChangeDate';// 修改有效期 - static const sendElectronicKeyManagePage = '/SendElectronicKeyManagePage';// 发送电子钥匙 - static const massSendElectronicKeyManagePage = '/MassSendElectronicKeyManagePage';// 群发钥匙 - static const electronicKeyPeriodValidityPage = '/ElectronicKeyPeriodValidityPage';// 电子钥匙有效期 - static const sendEmailNotificationPage = '/SendEmailNotificationPage';// 邮件通知 - static const passwordKeyListPage = '/PasswordKeyListPage';// 密码钥匙列表 - static const passwordKeyManagePage = '/PasswordKeyManagePage';// 密码钥匙 - static const passwordKeyDetailPage = '/PasswordKeyDetailPage';// 密码钥匙详情 - static const otherTypeKeyListPage = '/OtherTypeKeyListPage';// 卡、指纹、遥控钥匙列表 - static const otherTypeKeyDetailPage = '/OtherTypeKeyDetailPage';// 卡、指纹、遥控钥匙详情 - static const otherTypeKeyManagePage = '/OtherTypeKeyManagePage';// 卡、指纹、遥控钥匙添加 - static const authorizedAdminListPage = '/AuthorizedAdminListPage';// 授权管理员列表 - static const authorizedAdminDetailPage = '/AuthorizedAdminDetailPage';// 授权管理员详情 - static const authorizedAdminManagePage = '/AuthorizedAdminManagePage';// 授权管理员 - static const volumeAuthorizationLockManagePage = '/VolumeAuthorizationLockManagePage';// 批量授权锁 - static const lockOperatingRecordPage = '/LockOperatingRecordPage';// 操作记录 - static const lockSetPage = '/LockSetPage';// 锁设置 - static const basicInformationPage = '/BasicInformationPage';// 基本信息 - static const uploadElectricQuantityPage = '/UploadElectricQuantityPage';// 更新锁电量 - static const editLockNamePage = '/EditLockNamePage';// 修改锁名字 - static const lockSeletGroupingPage = '/LockSeletGroupingPage';// 锁选择分组 - static const adminOpenLockPasswordPage = '/AdminOpenLockPasswordPage';// 管理员开锁密码 - static const wirelessKeyboardPage = '/WirelessKeyboardPage';// 蓝牙键盘 - static const addWirelessKeyboardPage = '/AddWirelessKeyboardPage';// 添加蓝牙键盘 - static const addWirelessKeyboardScreenNotLightOnPage = '/AddWirelessKeyboardScreenNotLightOnPage';// 添加蓝牙键盘屏幕不亮时提示 - static const seletWirelessKeyboardPage = '/SeletWirelessKeyboardPage';// 选择蓝牙键盘 - static const doorMagneticPage = '/DoorMagneticPage';// 门磁列表 - static const addDoorMagneticPage = '/AddDoorMagneticPage';// 添加门磁 - static const nearbyDoorMagneticPage = '/NearbyDoorMagneticPage';// 附近的门磁 - static const remoteUnlockingPage = '/RemoteUnlockingPage';// 远程开锁 - static const automaticBlockingPage = '/AutomaticBlockingPage';// 自动闭锁 - static const normallyOpenModePage = '/NormallyOpenModePage';// 常开模式 - static const lockSoundSetPage = '/LockSoundSetPage';// 锁声音 - static const burglarAlarmPage = '/BurglarAlarmPage';// 防撬警报 - static const resetButtonPage = '/ResetButtonPage';// 锁重置键 - static const unlockQRCodePage = '/UnlockQRCodePage';// 开锁二维码 - static const lockTimePage = '/LockTimePage';// 锁时间 - static const diagnosePage = '/DiagnosePage';// 诊断 - static const uploadDataPage = '/UploadDataPage';// 上传数据 - static const importOtherLockDataPage = '/ImportOtherLockDataPage';// 导入其他锁数据 - static const lockEscalationPage = '/LockEscalationPage';// 锁升级 - static const markedHouseStatePage = '/MarkedHouseStatePage';// 标记房态 - static const checkingInListPage = '/CheckingInListPage';// 考勤 - static const checkingInSetPage = '/CheckingInSetPage';// 考勤设置 - static const checkingInStaffManagePage = '/CheckingInStaffManagePage';// 员工管理 - static const checkingInAddStaffPage = '/CheckingInAddStaffPage';// 添加员工 - static const checkingInSetWorkTimePage = '/CheckingInSetWorkTimePage';// 工作时间设置 - static const checkingInSetWorkdaySet = '/CheckingInSetWorkdaySet';// 工作日设置 - static const checkingInSetHolidaysPage = '/CheckingInSetHolidaysPage';// 节假日设置 - static const checkingInAddHolidaysPage = '/CheckingInAddHolidaysPage';// 添加假日 - static const checkingInDetailPage = '/CheckingInDetailPage';// 考勤详情 + static const initial = '/'; // 加载页 + static const starLockMain = '/StarLockMain'; // 首页 + static const starLockMinePage = '/StarLockMinePage'; // 我的 + static const seletLockTypePage = '/SeletLockTypePage'; // 选择锁类型 + static const addLockPage = '/AddLockPage'; // 选择锁类型 + static const nearbyLockPage = '/NearbyLockPage'; // 附近的锁 + static const lockAddressPage = '/LockAddressPage'; // 锁地址 + static const saveLockPage = '/SaveLockPage'; // 保存锁 + static const lockDetailPage = '/LockDetailPage'; // 锁详情 + static const electronicKeyListPage = '/ElectronicKeyListPage'; // 电子钥匙列表 + static const electronicKeyDetailPage = '/ElectronicKeyDetailPage'; // 电子钥匙详情 + static const electronicKeyDetailChangeDate = + '/ElectronicKeyDetailChangeDate'; // 修改有效期 + static const sendElectronicKeyManagePage = + '/SendElectronicKeyManagePage'; // 发送电子钥匙 + static const massSendElectronicKeyManagePage = + '/MassSendElectronicKeyManagePage'; // 群发钥匙 + static const electronicKeyPeriodValidityPage = + '/ElectronicKeyPeriodValidityPage'; // 电子钥匙有效期 + static const sendEmailNotificationPage = '/SendEmailNotificationPage'; // 邮件通知 + static const passwordKeyListPage = '/PasswordKeyListPage'; // 密码钥匙列表 + static const passwordKeyManagePage = '/PasswordKeyManagePage'; // 密码钥匙 + static const passwordKeyDetailPage = '/PasswordKeyDetailPage'; // 密码钥匙详情 + static const otherTypeKeyListPage = '/OtherTypeKeyListPage'; // 卡、指纹、遥控钥匙列表 + static const otherTypeKeyDetailPage = + '/OtherTypeKeyDetailPage'; // 卡、指纹、遥控钥匙详情 + static const otherTypeKeyManagePage = + '/OtherTypeKeyManagePage'; // 卡、指纹、遥控钥匙添加 + static const authorizedAdminListPage = '/AuthorizedAdminListPage'; // 授权管理员列表 + static const authorizedAdminDetailPage = + '/AuthorizedAdminDetailPage'; // 授权管理员详情 + static const authorizedAdminManagePage = + '/AuthorizedAdminManagePage'; // 授权管理员 + static const volumeAuthorizationLockManagePage = + '/VolumeAuthorizationLockManagePage'; // 批量授权锁 + static const lockOperatingRecordPage = '/LockOperatingRecordPage'; // 操作记录 + static const lockSetPage = '/LockSetPage'; // 锁设置 + static const basicInformationPage = '/BasicInformationPage'; // 基本信息 + static const uploadElectricQuantityPage = + '/UploadElectricQuantityPage'; // 更新锁电量 + static const editLockNamePage = '/EditLockNamePage'; // 修改锁名字 + static const lockSeletGroupingPage = '/LockSeletGroupingPage'; // 锁选择分组 + static const adminOpenLockPasswordPage = + '/AdminOpenLockPasswordPage'; // 管理员开锁密码 + static const wirelessKeyboardPage = '/WirelessKeyboardPage'; // 蓝牙键盘 + static const addWirelessKeyboardPage = '/AddWirelessKeyboardPage'; // 添加蓝牙键盘 + static const addWirelessKeyboardScreenNotLightOnPage = + '/AddWirelessKeyboardScreenNotLightOnPage'; // 添加蓝牙键盘屏幕不亮时提示 + static const seletWirelessKeyboardPage = + '/SeletWirelessKeyboardPage'; // 选择蓝牙键盘 + static const doorMagneticPage = '/DoorMagneticPage'; // 门磁列表 + static const addDoorMagneticPage = '/AddDoorMagneticPage'; // 添加门磁 + static const nearbyDoorMagneticPage = '/NearbyDoorMagneticPage'; // 附近的门磁 + static const remoteUnlockingPage = '/RemoteUnlockingPage'; // 远程开锁 + static const automaticBlockingPage = '/AutomaticBlockingPage'; // 自动闭锁 + static const normallyOpenModePage = '/NormallyOpenModePage'; // 常开模式 + static const lockSoundSetPage = '/LockSoundSetPage'; // 锁声音 + static const burglarAlarmPage = '/BurglarAlarmPage'; // 防撬警报 + static const resetButtonPage = '/ResetButtonPage'; // 锁重置键 + static const unlockQRCodePage = '/UnlockQRCodePage'; // 开锁二维码 + static const lockTimePage = '/LockTimePage'; // 锁时间 + static const diagnosePage = '/DiagnosePage'; // 诊断 + static const uploadDataPage = '/UploadDataPage'; // 上传数据 + static const importOtherLockDataPage = '/ImportOtherLockDataPage'; // 导入其他锁数据 + static const lockEscalationPage = '/LockEscalationPage'; // 锁升级 + static const markedHouseStatePage = '/MarkedHouseStatePage'; // 标记房态 + static const checkingInListPage = '/CheckingInListPage'; // 考勤 + static const checkingInSetPage = '/CheckingInSetPage'; // 考勤设置 + static const checkingInStaffManagePage = '/CheckingInStaffManagePage'; // 员工管理 + static const checkingInAddStaffPage = '/CheckingInAddStaffPage'; // 添加员工 + static const checkingInSetWorkTimePage = + '/CheckingInSetWorkTimePage'; // 工作时间设置 + static const checkingInSetWorkdaySet = '/CheckingInSetWorkdaySet'; // 工作日设置 + static const checkingInSetHolidaysPage = + '/CheckingInSetHolidaysPage'; // 节假日设置 + static const checkingInAddHolidaysPage = '/CheckingInAddHolidaysPage'; // 添加假日 + static const checkingInDetailPage = '/CheckingInDetailPage'; // 考勤详情 - static const mineSetPage = '/MineSetPage';// 我的设置 - static const mineMultiLanguagePage = '/MineMultiLanguagePage';// 我的设置 - static const minePersonInfoPage = '/MinePersonInfoPage';// 我的信息 - static const minePersonInfoEditNamePage = '/MinePersonInfoEditNamePage';// 我的信息编辑昵称 - static const minePersonInfoEditAccountPage = '/MinePersonInfoEditAccountPage';// 我的信息修改账号 - static const minePersonInfoEditAccountNextPage = '/MinePersonInfoEditAccountNextPage';// 我的信息修改账号下一页 - static const minePersonInfoEditIphonePage = '/MinePersonInfoEditIphonePage';// 我的信息修改手机号 - static const minePersonInfoResetPasswordPage = '/MinePersonInfoResetPasswordPage';// 我的信息重置密码 - static const minePersonInfoSetSafetyProblemPage = '/MinePersonInfoSetSafetyProblemPage';// 我的信息设置安全问题 + static const mineSetPage = '/MineSetPage'; // 我的设置 + static const mineMultiLanguagePage = '/MineMultiLanguagePage'; // 我的设置 + static const minePersonInfoPage = '/MinePersonInfoPage'; // 我的信息 + static const minePersonInfoEditNamePage = + '/MinePersonInfoEditNamePage'; // 我的信息编辑昵称 + static const minePersonInfoEditAccountPage = + '/MinePersonInfoEditAccountPage'; // 我的信息修改账号 + static const minePersonInfoEditAccountNextPage = + '/MinePersonInfoEditAccountNextPage'; // 我的信息修改账号下一页 + static const minePersonInfoEditIphonePage = + '/MinePersonInfoEditIphonePage'; // 我的信息修改手机号 + static const minePersonInfoResetPasswordPage = + '/MinePersonInfoResetPasswordPage'; // 我的信息重置密码 + static const minePersonInfoSetSafetyProblemPage = + '/MinePersonInfoSetSafetyProblemPage'; // 我的信息设置安全问题 - static const gatewayListPage = '/GatewayListPage';// 我的-网关 - static const gatewayDetailPage = '/GatewayDetailPage';// 我的-网关详情 - static const gatewayConnectionLockPage = '/GatewayConnectionLockPage';// 我的-网关网关链接的锁 - static const seletGatewayTypePage = '/SeletGatewayTypePage';// 我的-选择网关类型 - static const seletGatewayTypeNextTipPage = '/SeletGatewayTypeNextTipPage';// 我的-选择网关类型下一步 - static const seletGatewayPage = '/SeletGatewayPage';// 我的-选择网关 - static const gatewayConfigurationWifiPage = '/GatewayConfigurationWifiPage';// 我的-网关配置wifi + static const gatewayListPage = '/GatewayListPage'; // 我的-网关 + static const gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 + static const gatewayConnectionLockPage = + '/GatewayConnectionLockPage'; // 我的-网关网关链接的锁 + static const seletGatewayTypePage = '/SeletGatewayTypePage'; // 我的-选择网关类型 + static const seletGatewayTypeNextTipPage = + '/SeletGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 + static const seletGatewayPage = '/SeletGatewayPage'; // 我的-选择网关 + static const gatewayConfigurationWifiPage = + '/GatewayConfigurationWifiPage'; // 我的-网关配置wifi - static const messageListPage = '/MessageListPage';// 我的-消息 - static const supportStaffPage = '/SupportStaffPage';// 我的-客服 - static const valueAddedServicesPage = '/ValueAddedServicesPage';// 我的-增值服务 - static const abountPage = '/AbountPage';// 我的-关于 + static const messageListPage = '/MessageListPage'; // 我的-消息 + static const supportStaffPage = '/SupportStaffPage'; // 我的-客服 + static const valueAddedServicesPage = '/ValueAddedServicesPage'; // 我的-增值服务 + static const abountPage = '/AbountPage'; // 我的-关于 - static const valueAddedServicesNoteAndEmailDetailPage = '/ValueAddedServicesNoteAndEmailDetailPage';// 增值服务-短信邮件详情 - static const valueAddedServicesRealNamePage = '/ValueAddedServicesRealNamePage';// 增值服务-实名认证详情 - static const valueAddedServicesHighFunctionPage = '/ValueAddedServicesHighFunctionPage';// 增值服务-高级功能 - static const valueAddedServicesBuyPage = '/ValueAddedServicesBuyPage';// 增值服务-购买服务 - static const valueAddedServicesListSMSTemplatePage = '/ValueAddedServicesListSMSTemplatePage';// 增值服务-短信模版列表 - static const valueAddedServicesAddSMSTemplatePage = '/valueAddedServicesAddSMSTemplatePage';// 增值服务-自定义短信模版 - static const valueAddedServicesListEmailTemplatePage = '/ValueAddedServicesListEmailTemplatePage';// 增值服务-邮箱模版列表 - static const valueAddedServicesAddEmailTemplatePage = '/ValueAddedServicesAddEmailTemplatePage';// 增值服务-自定义邮箱模版 - static const valueAddedServicesBuyAndUseRecordManagePage = '/ValueAddedServicesBuyAndUseRecordManagePage';// 增值服务-购买使用记录 + static const valueAddedServicesNoteAndEmailDetailPage = + '/ValueAddedServicesNoteAndEmailDetailPage'; // 增值服务-短信邮件详情 + static const valueAddedServicesRealNamePage = + '/ValueAddedServicesRealNamePage'; // 增值服务-实名认证详情 + static const valueAddedServicesHighFunctionPage = + '/ValueAddedServicesHighFunctionPage'; // 增值服务-高级功能 + static const valueAddedServicesBuyPage = + '/ValueAddedServicesBuyPage'; // 增值服务-购买服务 + static const valueAddedServicesListSMSTemplatePage = + '/ValueAddedServicesListSMSTemplatePage'; // 增值服务-短信模版列表 + static const valueAddedServicesAddSMSTemplatePage = + '/valueAddedServicesAddSMSTemplatePage'; // 增值服务-自定义短信模版 + static const valueAddedServicesListEmailTemplatePage = + '/ValueAddedServicesListEmailTemplatePage'; // 增值服务-邮箱模版列表 + static const valueAddedServicesAddEmailTemplatePage = + '/ValueAddedServicesAddEmailTemplatePage'; // 增值服务-自定义邮箱模版 + static const valueAddedServicesBuyAndUseRecordManagePage = + '/ValueAddedServicesBuyAndUseRecordManagePage'; // 增值服务-购买使用记录 - static const lockScreenPage = '/LockScreenPage';// 我的设置-锁屏 - static const aPPUnlockNeedMobileNetworkingLockPage = '/APPUnlockNeedMobileNetworkingLockPage';// 我的设置-app开锁时需手机连网的锁 - static const hideInvalidUnlockPermissionsPage = '/HideInvalidUnlockPermissionsPage';// 我的设置-隐藏无效开锁权限 + static const lockScreenPage = '/LockScreenPage'; // 我的设置-锁屏 + static const aPPUnlockNeedMobileNetworkingLockPage = + '/APPUnlockNeedMobileNetworkingLockPage'; // 我的设置-app开锁时需手机连网的锁 + static const hideInvalidUnlockPermissionsPage = + '/HideInvalidUnlockPermissionsPage'; // 我的设置-隐藏无效开锁权限 - static const starLockLoginPage = '/StarLockLoginPage';// 登录 - static const starLockRegisterPage = '/StarLockRegisterPage';// 注册 - static const starLockForgetPasswordPage = '/StarLockForgetPasswordPage';// 忘记密码 - static const seletCountryRegionPage = '/SeletCountryRegionPage';// 选择国家和地区 + static const lockUserManageLisPage = '/LockUserManageLisPage'; //我的设置-锁用户管理 + static const authorizedAdministratorListPage = + '/AuthorizedAdministratorListPage'; //我的设置-授权管理员 + + static const starLockLoginPage = '/StarLockLoginPage'; // 登录 + static const starLockRegisterPage = '/StarLockRegisterPage'; // 注册 + static const starLockForgetPasswordPage = + '/StarLockForgetPasswordPage'; // 忘记密码 + static const seletCountryRegionPage = '/SeletCountryRegionPage'; // 选择国家和地区 } abstract class AppRouters { @@ -424,7 +466,7 @@ abstract class AppRouters { GetPage( name: Routers.lockTimePage, page: () => const LockTimePage(), - ),// 诊断 + ), // 诊断 GetPage( name: Routers.diagnosePage, page: () => const DiagnosePage(), @@ -601,5 +643,11 @@ abstract class AppRouters { name: Routers.hideInvalidUnlockPermissionsPage, page: () => const HideInvalidUnlockPermissionsPage(), ), + GetPage( + name: Routers.authorizedAdministratorListPage, + page: () => const AuthorizedAdministratorListPage()), + GetPage( + name: Routers.lockUserManageLisPage, + page: () => const LockUserManageListListPage()) ]; -} \ No newline at end of file +} diff --git a/star_lock/lib/app_settings/app_colors.dart b/star_lock/lib/app_settings/app_colors.dart index c505b278..5901a74d 100644 --- a/star_lock/lib/app_settings/app_colors.dart +++ b/star_lock/lib/app_settings/app_colors.dart @@ -1,10 +1,8 @@ - import 'dart:ui'; import 'package:flutter/material.dart'; class AppColors { - // static Color mainColor = const Color(0xFF385DEA); static Color mainColor = const Color(0xFF4777EE); static Color mainBackgroundColor = const Color(0xFFF5F5F5); @@ -22,7 +20,6 @@ class AppColors { static Color buttonEnableTextColor = const Color(0xFFFFFFFF); static Color buttonDisableTextColor = buttonEnableTextColor.withOpacity(0.6); - static Color deleteBtnBgColor = const Color(0xFFFF495C).withOpacity(0.7); static Color touristColor = const Color(0xFFF58A22); @@ -37,20 +34,21 @@ class AppColors { static Color dialogInputBgColor = pickerItemSelectedBgColor; static Color introduceDialogBgColor = const Color(0xFF112B4C); - static Color pickerTitleTextColor = const Color(0xFF000000); static Color pickerInfoTextColor = pickerTitleTextColor.withOpacity(0.5); static Color pickerItemSelectedTextColor = const Color(0xFF0093E5); static Color pickerItemSelectedBgColor = const Color(0xFFE4E4E4); - static Color pickerItemUnselectTextColor = pickerTitleTextColor.withOpacity(0.5); + static Color pickerItemUnselectTextColor = + pickerTitleTextColor.withOpacity(0.5); static Color normalTextColor = const Color(0xFFFFFFFF); static Color inputErrorTextColor = const Color(0xFFFF6666); - static Color errorImageColor = const Color(0xFFFF495C ); + static Color errorImageColor = const Color(0xFFFF495C); static Color inputTitleTextColor = const Color(0xFFFFFFFF).withOpacity(0.6); - static Color settingItemInfoTextColor = const Color(0xFFFFFFFF).withOpacity(0.6); - static Color dividerColor = const Color(0xFFFFFFFF).withOpacity(0.6); + static Color settingItemInfoTextColor = + const Color(0xFFFFFFFF).withOpacity(0.6); + static Color dividerColor = const Color(0xFFFFFFFF).withOpacity(0.6); static Color textFieldEnableBorderColor = normalTextColor.withOpacity(0.2); static Color textFieldFocusBorderColor = normalTextColor.withOpacity(0.2); @@ -59,7 +57,6 @@ class AppColors { static Color protocolTextColor = touristColor; - static Color topTabBarSelectedBgColor = buttonEnableColor; static Color topTabBarUnselectedBgColor = buttonEnableTextColor; static Color tapTabBarSelectedTextColor = buttonEnableTextColor; @@ -71,26 +68,26 @@ class AppColors { static Color wifiDisableColor = const Color(0xFFA8A8A8); - static Color get paginationColor => const Color(0xFF01295C).withOpacity(45); - static Color get paginationActiveColor => const Color(0xFFFFFFFF).withOpacity(65); + static Color get paginationActiveColor => + const Color(0xFFFFFFFF).withOpacity(65); static Color scanPointerLineColor = Colors.blue; - static Color scanColor0 = const Color(0xFF0093E5).withOpacity(0.05); + static Color scanColor0 = const Color(0xFF0093E5).withOpacity(0.05); static Color scanColor1 = const Color(0xFF0093E5).withOpacity(0.1); static Color scanColor2 = const Color(0xFF0093E5).withOpacity(0.3); static Color scanColor3 = const Color(0xFF0093E5).withOpacity(0.5); static Color scanColor4 = const Color(0xFF0093E5).withOpacity(0.9); - static Color scanCircleCenterColor0 = Colors.blue.withOpacity(0.9); - static Color scanCircleCenterColor1 = const Color(0xffE9F3FF).withOpacity(0.8); + static Color scanCircleCenterColor0 = Colors.blue.withOpacity(0.9); + static Color scanCircleCenterColor1 = + const Color(0xffE9F3FF).withOpacity(0.8); static Color starCenterColor = const Color(0xFF0093E5); - static Color starMiddleColor = const Color.fromRGBO(255, 255, 255,1); - static Color starBorderColor = const Color.fromRGBO(255, 255, 255,0.2); - static Color starOutsideColor = const Color.fromRGBO(255, 255, 255,0.01); - + static Color starMiddleColor = const Color.fromRGBO(255, 255, 255, 1); + static Color starBorderColor = const Color.fromRGBO(255, 255, 255, 0.2); + static Color starOutsideColor = const Color.fromRGBO(255, 255, 255, 0.01); static Color workingStateInfoBgColor = const Color(0xFF20354E); @@ -98,9 +95,9 @@ class AppColors { static Color color_level_1 = const Color(0xFFFFFFFF); static Color color_level_2 = const Color(0xFFF7B500); - static Color switchTrackSelectedColor = const Color(0xFF0093E5); - static Color switchTrackUnselectedColor = const Color(0xFF5A6676).withOpacity(0.5); + static Color switchTrackUnselectedColor = + const Color(0xFF5A6676).withOpacity(0.5); static Color switchThumbColor = const Color(0xFFFFFFFF); static Color popMenuItemUnselectedBg = const Color(0xFF112B4C); @@ -108,15 +105,15 @@ class AppColors { static Color blackColor = const Color(0xFF000000); - static Color dateSelectedBgColor = const Color(0xFF0093E5); static Color dateSelectedTextColor = const Color(0xFFFFFFFF); static Color dateUnselectedTextColor = blackColor; - static Color dateUnselectedDialogBgColor = const Color(0xFFC9C9C9).withOpacity(0.5); + static Color dateUnselectedDialogBgColor = + const Color(0xFFC9C9C9).withOpacity(0.5); static Color dateUnselectedBgColor = const Color(0xFFFFFFFF); - static Color progressBgColor = const Color(0xFF022345); static Color progressValueColor = const Color(0xFF0093E5); -} \ No newline at end of file + static const greyLineColor = Color.fromRGBO(240, 240, 240, 1); //灰色分割线 +} diff --git a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart index 9d7026dc..3eedc10f 100644 --- a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart +++ b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -30,10 +31,9 @@ class _AuthorizedAdminPageState extends State { void initState() { // TODO: implement initState super.initState(); - } - Widget indexChangeWidget(){ + Widget indexChangeWidget() { switch (int.parse(widget.type)) { case 0: { @@ -49,7 +49,7 @@ class _AuthorizedAdminPageState extends State { ); } default: - // 永久 + // 永久 return Column( children: [ keyInfoWidget(), @@ -61,45 +61,68 @@ class _AuthorizedAdminPageState extends State { } // 顶部钥匙信息widget - Widget keyInfoWidget(){ + Widget keyInfoWidget() { return Column( children: [ Container(height: 10.h), - CommonItem(leftTitel:TranslationLoader.lanKeys!.receiver!.tr, rightTitle:"", isHaveLine: true, isHaveRightWidget: true, rightWidget: getTFWidget(true, TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr)), - CommonItem(leftTitel:TranslationLoader.lanKeys!.name!.tr, rightTitle:"", isHaveRightWidget: true, rightWidget: getTFWidget(false, TranslationLoader.lanKeys!.pleaseEnter!.tr)), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.receiver!.tr, + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: getTFWidget( + true, TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr)), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.name!.tr, + rightTitle: "", + isHaveRightWidget: true, + rightWidget: + getTFWidget(false, TranslationLoader.lanKeys!.pleaseEnter!.tr)), Container(height: 10.h), ], ); } // 生效失效时间 - Widget keyTimeWidget(){ + Widget keyTimeWidget() { return Column( children: [ - CommonItem(leftTitel:TranslationLoader.lanKeys!.effectiveTime!.tr, rightTitle:"2020.06.20 11:49", isHaveLine: true, isHaveDirection: true, action:(){ - // _showDatePicker(); - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.failureTime!.tr, rightTitle:"2020.06.20 11:49", isHaveDirection: true, action:(){ - // _showDatePicker(); - }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr, + rightTitle: "2020.06.20 11:49", + isHaveLine: true, + isHaveDirection: true, + action: () { + // _showDatePicker(); + }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.failureTime!.tr, + rightTitle: "2020.06.20 11:49", + isHaveDirection: true, + action: () { + // _showDatePicker(); + }), Container(height: 10.h), ], ); } // 实名认证 - Widget keyRealNameWidget(){ + Widget keyRealNameWidget() { return Column( children: [ - CommonItem(leftTitel:TranslationLoader.lanKeys!.realNameAuthentication!.tr, rightTitle:"", isHaveRightWidget: true, rightWidget: Container(width: 80.w, height: 50.h,child: _switch()), action:(){ - - }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.realNameAuthentication!.tr, + rightTitle: "", + isHaveRightWidget: true, + rightWidget: Container(width: 80.w, height: 50.h, child: _switch()), + action: () {}), Container(height: 10.h), ], ); } - Widget keyBottomWidget(String tipStr){ + Widget keyBottomWidget(String tipStr) { return Column( children: [ Container( @@ -107,24 +130,37 @@ class _AuthorizedAdminPageState extends State { child: Row( // crossAxisAlignment: CrossAxisAlignment.start, children: [ - Expanded(child: Text(tipStr, textAlign: TextAlign.start,)), + Expanded( + child: Text( + tipStr, + textAlign: TextAlign.start, + )), ], ), ), - SubmitBtn(btnName: TranslationLoader.lanKeys!.sender!.tr, borderRadius: 20.w, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), - onClick: (){ - - } - ), + SubmitBtn( + btnName: TranslationLoader.lanKeys!.sender!.tr, + borderRadius: 20.w, + margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () {}), Container( - padding: EdgeInsets.only(right:30.w), + padding: EdgeInsets.only(right: 30.w), // color: Colors.red, child: Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - TextButton(onPressed: (){ - Navigator.pushNamed(context, Routers.volumeAuthorizationLockManagePage); - }, child: Text(TranslationLoader.lanKeys!.volumeAuthorizationLock!.tr, style: TextStyle(color: AppColors.mainColor, fontWeight: FontWeight.w500),)), + TextButton( + onPressed: () { + Navigator.pushNamed( + context, Routers.volumeAuthorizationLockManagePage); + }, + child: Text( + TranslationLoader.lanKeys!.volumeAuthorizationLock!.tr, + style: TextStyle( + color: AppColors.mainColor, + fontWeight: FontWeight.w500), + )), ], ), ), @@ -133,7 +169,7 @@ class _AuthorizedAdminPageState extends State { } // 发送电子钥匙成功 - Widget sendElectronicKeySucceed(){ + Widget sendElectronicKeySucceed() { return Column( children: [ Container( @@ -142,37 +178,72 @@ class _AuthorizedAdminPageState extends State { color: Colors.white, child: Column( children: [ - SizedBox(height: 30.h,), - Image.asset('images/main/icon_main_addLock.png', width: 150.w, height: 150.w, color: AppColors.mainColor,), - SizedBox(height: 20.h,), + SizedBox( + height: 30.h, + ), + Image.asset( + 'images/main/icon_main_addLock.png', + width: 150.w, + height: 150.w, + color: AppColors.mainColor, + ), + SizedBox( + height: 20.h, + ), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text("发送成功",style: TextStyle(fontSize: 32.sp, color: Colors.black, fontWeight: FontWeight.w500),), + Text( + "发送成功", + style: TextStyle( + fontSize: 32.sp, + color: Colors.black, + fontWeight: FontWeight.w500), + ), ], ), ], ), ), - SizedBox(height: 20.h,), - SubmitBtn(btnName: '完成', fontSize: 28.sp, borderRadius: 20.w, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){ - - }), - SubmitBtn(btnName: '邮件通知', fontSize: 28.sp, borderRadius: 20.w, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){ - Navigator.pushNamed(context, Routers.sendEmailNotificationPage); - }), - SubmitBtn(btnName: '微信通知', fontSize: 28.sp, borderRadius: 20.w, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){ - - }), - SubmitBtn(btnName: '标记为已入住', fontSize: 28.sp, borderRadius: 20.w, margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){ - - }), + SizedBox( + height: 20.h, + ), + SubmitBtn( + btnName: '完成', + fontSize: 28.sp, + borderRadius: 20.w, + margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () {}), + SubmitBtn( + btnName: '邮件通知', + fontSize: 28.sp, + borderRadius: 20.w, + margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () { + Navigator.pushNamed(context, Routers.sendEmailNotificationPage); + }), + SubmitBtn( + btnName: '微信通知', + fontSize: 28.sp, + borderRadius: 20.w, + margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () {}), + SubmitBtn( + btnName: '标记为已入住', + fontSize: 28.sp, + borderRadius: 20.w, + margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () {}), ], ); } // 接受者信息输入框 - Widget getTFWidget(bool isHaveBtn, String tfStr){ + Widget getTFWidget(bool isHaveBtn, String tfStr) { return Container( height: 50.h, width: 500.w, @@ -184,7 +255,7 @@ class _AuthorizedAdminPageState extends State { maxLines: 1, // controller: _controller, autofocus: false, - textAlign:TextAlign.end, + textAlign: TextAlign.end, decoration: InputDecoration( //输入里面输入文字内边距设置 contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0), @@ -194,34 +265,38 @@ class _AuthorizedAdminPageState extends State { ), ), ), - SizedBox(width: 10.w,), - isHaveBtn?Container( - width: 50.w, - height: 50.w, - decoration: const BoxDecoration( - color: Colors.white, - image: DecorationImage( - image: AssetImage('images/icon_lock.png'), - fit: BoxFit.fill - ), - ), - alignment: Alignment.center, - child: InkWell( - onTap: () async { - Contact? contact = await _contactPicker.selectContact(); - setState(() { - _contact = contact!; - // print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}"); - }); - }, - ), - ):Container() + SizedBox( + width: 10.w, + ), + isHaveBtn + ? Container( + width: 50.w, + height: 50.w, + decoration: const BoxDecoration( + color: Colors.white, + image: DecorationImage( + image: AssetImage('images/icon_lock.png'), + fit: BoxFit.fill), + ), + alignment: Alignment.center, + child: InkWell( + onTap: () async { + Contact? contact = await _contactPicker.selectContact(); + setState(() { + _contact = contact!; + // print("object111111111111 ${_contact.fullName} ${_contact.phoneNumbers}"); + }); + }, + ), + ) + : Container() ], ), ); } - Switch _switch(){ + CupertinoSwitch _switch() { + /* return Switch( value: false, onChanged: (value){ @@ -231,6 +306,18 @@ class _AuthorizedAdminPageState extends State { }); } ); + */ + bool _isOn = false; + return CupertinoSwitch( + activeColor: CupertinoColors.activeBlue, + trackColor: CupertinoColors.systemGrey5, + thumbColor: CupertinoColors.white, + value: _isOn, + onChanged: (value) { + setState(() { + _isOn = value; + }); + }, + ); } - } diff --git a/star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart b/star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart index 97ae4832..8b596cd2 100644 --- a/star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart +++ b/star_lock/lib/main/lockDetail/lcokSet/unlockQRCode/unlockQRCode_page.dart @@ -20,8 +20,11 @@ class _UnlockQRCodePageState extends State { Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.burglarAlarm!.tr, haveBack:true, backgroundColor: AppColors.mainColor), - body:Column( + appBar: TitleAppBar( + barTitle: TranslationLoader.lanKeys!.burglarAlarm!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor), + body: Column( children: [ Container( padding: EdgeInsets.all(25.w), @@ -30,11 +33,11 @@ class _UnlockQRCodePageState extends State { color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(10.h)), ), - child: Text("拥有电子钥匙的人，通过微信扫一扫这个二维码，即可开门。每把锁的二维码都不相同，你可以将其打印出来贴在对应的锁旁边") - ), + child: Text( + "拥有电子钥匙的人，通过微信扫一扫这个二维码，即可开门。每把锁的二维码都不相同，你可以将其打印出来贴在对应的锁旁边")), Container( width: 1.sw, - padding: EdgeInsets.only(top:50.w), + padding: EdgeInsets.only(top: 50.w), margin: EdgeInsets.only(left: 25.w, right: 25.w), decoration: BoxDecoration( color: Colors.white, @@ -47,24 +50,25 @@ class _UnlockQRCodePageState extends State { // data:'二维码', // size:300, // ), + //by Daisy ##warning QrImage(data: 'www.baidu.com', size: 300.w), - SizedBox(height: 50.w,), - SubmitBtn(btnName: TranslationLoader.lanKeys!.share!.tr, + SizedBox( + height: 50.w, + ), + SubmitBtn( + btnName: TranslationLoader.lanKeys!.share!.tr, borderRadius: 20.w, fontSize: 32.sp, width: 250.w, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w), - onClick: () { - - } - ), - SizedBox(height: 60.w,) + onClick: () {}), + SizedBox( + height: 60.w, + ) ], - ) - ), + )), ], - ) - ); + )); } } diff --git a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorListPage.dart b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorListPage.dart new file mode 100644 index 00000000..2827c7ba --- /dev/null +++ b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministratorListPage.dart @@ -0,0 +1,152 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; + +import '../../../../appRouters.dart'; +import '../../../../app_settings/app_colors.dart'; +import '../../../../tools/titleAppBar.dart'; +import '../../../../translations/trans_lib.dart'; + +class AuthorizedAdministratorListPage extends StatefulWidget { + const AuthorizedAdministratorListPage({Key? key}) : super(key: key); + + @override + State createState() => + _AuthorizedAdministratorListPageState(); +} + +class _AuthorizedAdministratorListPageState + extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: AppColors.mainBackgroundColor, + appBar: TitleAppBar( + barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor, + actionsList: [ + IconButton( + icon: const Icon(Icons.add), + onPressed: () { + // 处理操作按钮的点击事件 + Navigator.pushNamed(context, Routers.authorizedAdminManagePage); + }, + ), + ], + ), + body: Column( + children: [ + _searchWidget(), + Expanded(child: _buildMainUI()), + ], + ), + ); + } + + Widget _searchWidget() { + return Container( + height: 80.h, + margin: EdgeInsets.only(top: 20.w, left: 20.w, right: 20.w), + decoration: BoxDecoration( + color: Colors.white, borderRadius: BorderRadius.circular(5)), + child: TextField( + //输入框一行 + maxLines: 1, + // controller: _controller, + autofocus: false, + decoration: InputDecoration( + //输入里面输入文字内边距设置 + contentPadding: const EdgeInsets.only( + top: 12.0, left: -19.0, right: -15.0, bottom: 8.0), + hintText: TranslationLoader.lanKeys!.pleaseEnter!.tr, + //不需要输入框下划线 + border: InputBorder.none, + //左边图标设置 + icon: Padding( + padding: EdgeInsets.only( + top: 30.w, bottom: 20.w, right: 20.w, left: 20.w), + child: Image.asset( + 'images/main/icon_main_search.png', + width: 40.w, + height: 40.w, + ), + ), + ), + ), + ); + } + + Widget _buildMainUI() { + return ListView.builder( + itemCount: 10, + itemBuilder: (c, index) { + return _electronicKeyItem('images/icon_lock.png', "张三", + "2023.6.21 11.15", "2023.6.21 11.15", () { + Navigator.pushNamed(context, Routers.authorizedAdminDetailPage); + }); + }); + } + + Widget _electronicKeyItem(String lockTypeIcon, String lockTypeTitle, + String beginTime, String endTime, Function() action) { + return GestureDetector( + onTap: action, + child: Container( + height: 100.h, + margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(10.w), + ), + child: Row( + children: [ + SizedBox( + width: 30.w, + ), + Image.asset( + lockTypeIcon, + width: 50.w, + height: 50.w, + ), + SizedBox( + width: 30.w, + ), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + lockTypeTitle, + style: TextStyle( + fontSize: 32.sp, fontWeight: FontWeight.w500), + ), + ], + ), + SizedBox(height: 5.h), + Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + "2023.6.21 11.15 永久", + style: TextStyle( + fontSize: 28.sp, fontWeight: FontWeight.w500), + ), + ], + ), + ), + SizedBox(width: 20.h), + ], + ), + ), + SizedBox(width: 20.h), + ], + ), + ), + ); + } +} diff --git a/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageListPage.dart b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageListPage.dart new file mode 100644 index 00000000..0e1a2fb7 --- /dev/null +++ b/star_lock/lib/mine/mineSet/lockUserManage/lockUserManageListPage.dart @@ -0,0 +1,163 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; + +import '../../../../appRouters.dart'; +import '../../../../app_settings/app_colors.dart'; +import '../../../../tools/titleAppBar.dart'; +import '../../../../translations/trans_lib.dart'; +import '../../../tools/submitBtn.dart'; + +class LockUserManageListListPage extends StatefulWidget { + const LockUserManageListListPage({Key? key}) : super(key: key); + + @override + State createState() => + _LockUserManageListListPageState(); +} + +class _LockUserManageListListPageState + extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: AppColors.mainBackgroundColor, + appBar: TitleAppBar( + barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor, + actionsList: [ + TextButton( + child: Text( + TranslationLoader.lanKeys!.aboutToExpire!.tr, + style: const TextStyle(color: Colors.white), + ), + onPressed: () {}, + ), + ], + ), + body: Column( + children: [ + _searchWidget(), + Expanded(child: _buildMainUI()), + SubmitBtn( + btnName: TranslationLoader.lanKeys!.sendGroupKey!.tr, + borderRadius: 20.w, + margin: EdgeInsets.only( + left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () { + Navigator.pushNamed( + context, Routers.massSendElectronicKeyManagePage); + }), + ], + ), + ); + } + + Widget _searchWidget() { + return Container( + height: 80.h, + margin: EdgeInsets.only(top: 20.w, left: 20.w, right: 20.w), + decoration: BoxDecoration( + color: Colors.white, borderRadius: BorderRadius.circular(5)), + child: TextField( + //输入框一行 + maxLines: 1, + // controller: _controller, + autofocus: false, + decoration: InputDecoration( + //输入里面输入文字内边距设置 + contentPadding: const EdgeInsets.only( + top: 12.0, left: -19.0, right: -15.0, bottom: 8.0), + hintText: TranslationLoader.lanKeys!.pleaseEnter!.tr, + //不需要输入框下划线 + border: InputBorder.none, + //左边图标设置 + icon: Padding( + padding: EdgeInsets.only( + top: 30.w, bottom: 20.w, right: 20.w, left: 20.w), + child: Image.asset( + 'images/main/icon_main_search.png', + width: 40.w, + height: 40.w, + ), + ), + ), + ), + ); + } + + Widget _buildMainUI() { + return ListView.builder( + itemCount: 10, + itemBuilder: (c, index) { + return _electronicKeyItem('images/icon_lock.png', "张三", + "2023.6.21 11.15", "2023.6.21 11.15", () { + Navigator.pushNamed(context, Routers.authorizedAdminDetailPage); + }); + }); + } + + Widget _electronicKeyItem(String lockTypeIcon, String lockTypeTitle, + String beginTime, String endTime, Function() action) { + return GestureDetector( + onTap: action, + child: Container( + height: 100.h, + margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.w), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(10.w), + ), + child: Row( + children: [ + SizedBox( + width: 30.w, + ), + Image.asset( + lockTypeIcon, + width: 50.w, + height: 50.w, + ), + SizedBox( + width: 30.w, + ), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + lockTypeTitle, + style: TextStyle( + fontSize: 32.sp, fontWeight: FontWeight.w500), + ), + ], + ), + SizedBox(height: 5.h), + Container( + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + "2023.6.21 11.15 永久", + style: TextStyle( + fontSize: 28.sp, fontWeight: FontWeight.w500), + ), + ], + ), + ), + SizedBox(width: 20.h), + ], + ), + ), + SizedBox(width: 20.h), + ], + ), + ), + ); + } +} diff --git a/star_lock/lib/mine/mineSet/mineSet_page.dart b/star_lock/lib/mine/mineSet/mineSet_page.dart index 5cc88b20..782a14e4 100644 --- a/star_lock/lib/mine/mineSet/mineSet_page.dart +++ b/star_lock/lib/mine/mineSet/mineSet_page.dart @@ -1,3 +1,4 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -17,52 +18,128 @@ class MineSetPage extends StatefulWidget { } class _MineSetPageState extends State { + bool _isOn = false; + @override Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.moreSet!.tr, haveBack:true, backgroundColor: AppColors.mainColor), - body:Column( + appBar: TitleAppBar( + barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor), + body: Column( children: [ Expanded( child: ListView( children: [ - CommonItem(leftTitel:TranslationLoader.lanKeys!.prompTone!.tr, rightTitle:"", isHaveLine: true, isHaveRightWidget:true, rightWidget: Container(width: 80.w, height: 50.h,child: _switch())), - CommonItem(leftTitel:TranslationLoader.lanKeys!.touchUnlock!.tr, rightTitle:"", isHaveLine: true, isHaveRightWidget:true, rightWidget: Container(width: 80.w, height: 50.h,child: _switch())), - CommonItem(leftTitel:TranslationLoader.lanKeys!.pushNotification!.tr, rightTitle:"", isHaveRightWidget:true, rightWidget: Container(width: 80.w, height: 50.h,child: _switch())), - SizedBox(height: 10.h,), - CommonItem(leftTitel:TranslationLoader.lanKeys!.lockUserManagement!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ - - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.authorizedAdmin!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ - - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.lockGroup!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ - - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.transferSmartLock!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ - - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.transferGateway!.tr, rightTitle:"", isHaveDirection: true, action: (){ - - }), - SizedBox(height: 10.h,), - CommonItem(leftTitel:TranslationLoader.lanKeys!.multiLanguage!.tr, rightTitle:"简体中文", isHaveLine: true, isHaveDirection: true, action: (){ - Navigator.pushNamed(context, Routers.mineMultiLanguagePage); - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.lockScreen!.tr, rightTitle:TranslationLoader.lanKeys!.opened!.tr, isHaveLine: true, isHaveDirection: true, action: (){ - Navigator.pushNamed(context, Routers.lockScreenPage); - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.hideInvalidUnlockPermissions!.tr, rightTitle:TranslationLoader.lanKeys!.closed!.tr, isHaveLine: true, isHaveDirection: true, action: (){ - Navigator.pushNamed(context, Routers.hideInvalidUnlockPermissionsPage); - }), - CommonItem(leftTitel:TranslationLoader.lanKeys!.appUnlockRequiresMobilePhoneAccessToTheLock!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ - Navigator.pushNamed(context, Routers.aPPUnlockNeedMobileNetworkingLockPage); - }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.prompTone!.tr, + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 80.w, height: 50.h, child: _switch())), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.touchUnlock!.tr, + rightTitle: "", + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 80.w, height: 50.h, child: _switch())), + CommonItem( + leftTitel: + TranslationLoader.lanKeys!.pushNotification!.tr, + rightTitle: "", + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 80.w, height: 50.h, child: _switch())), + SizedBox( + height: 10.h, + ), + CommonItem( + leftTitel: + TranslationLoader.lanKeys!.lockUserManagement!.tr, + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed( + context, Routers.lockUserManageLisPage); + }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed( + context, Routers.authorizedAdministratorListPage); + }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.lockGroup!.tr, + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () {}), + CommonItem( + leftTitel: + TranslationLoader.lanKeys!.transferSmartLock!.tr, + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () {}), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.transferGateway!.tr, + rightTitle: "", + isHaveDirection: true, + action: () {}), + SizedBox( + height: 10.h, + ), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.multiLanguage!.tr, + rightTitle: "简体中文", + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed( + context, Routers.mineMultiLanguagePage); + }), + CommonItem( + leftTitel: TranslationLoader.lanKeys!.lockScreen!.tr, + rightTitle: TranslationLoader.lanKeys!.opened!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, Routers.lockScreenPage); + }), + CommonItem( + leftTitel: TranslationLoader + .lanKeys!.hideInvalidUnlockPermissions!.tr, + rightTitle: TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed( + context, Routers.hideInvalidUnlockPermissionsPage); + }), + CommonItem( + leftTitel: TranslationLoader.lanKeys! + .appUnlockRequiresMobilePhoneAccessToTheLock!.tr, + rightTitle: "", + isHaveLine: true, + isHaveDirection: true, + action: () { + Navigator.pushNamed(context, + Routers.aPPUnlockNeedMobileNetworkingLockPage); + }), // CommonItem(leftTitel:TranslationLoader.lanKeys!.valueAddedServices!.tr, rightTitle:"", isHaveDirection: true, action: (){ // // }), - SizedBox(height: 10.h,), + SizedBox( + height: 10.h, + ), // CommonItem(leftTitel:TranslationLoader.lanKeys!.about!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ // // }), @@ -87,8 +164,7 @@ class _MineSetPageState extends State { ), // keyBottomWidget() ], - ) - ); + )); } // Widget keyBottomWidget() { @@ -123,15 +199,17 @@ class _MineSetPageState extends State { // ); // } - Switch _switch(){ - return Switch( - value: false, - onChanged: (value){ - // switchValue = !switchValue; - setState(() { - - }); - } + CupertinoSwitch _switch() { + return CupertinoSwitch( + activeColor: CupertinoColors.activeBlue, + trackColor: CupertinoColors.systemGrey5, + thumbColor: CupertinoColors.white, + value: _isOn, + onChanged: (value) { + setState(() { + _isOn = value; + }); + }, ); } } diff --git a/star_lock/lib/tools/commonItem.dart b/star_lock/lib/tools/commonItem.dart index 0693f7cd..2c2f33c4 100644 --- a/star_lock/lib/tools/commonItem.dart +++ b/star_lock/lib/tools/commonItem.dart @@ -1,6 +1,6 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:star_lock/app_settings/app_colors.dart'; class CommonItem extends StatelessWidget { String? leftTitel; @@ -12,14 +12,17 @@ class CommonItem extends StatelessWidget { Function()? action; double? allHeight; - CommonItem({Key? key, - required this.leftTitel, - this.rightTitle, - this.allHeight = 45, - this.isHaveDirection = false, - this.isHaveLine = false, - this.isHaveRightWidget = false, - this.rightWidget, this.action}) : super(key: key); + CommonItem( + {Key? key, + required this.leftTitel, + this.rightTitle, + this.allHeight = 45, + this.isHaveDirection = false, + this.isHaveLine = false, + this.isHaveRightWidget = false, + this.rightWidget, + this.action}) + : super(key: key); @override Widget build(BuildContext context) { @@ -29,27 +32,53 @@ class CommonItem extends StatelessWidget { // mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - height: allHeight??70.h, + height: allHeight ?? 70.h, color: Colors.white, - padding: EdgeInsets.only(left:20.w, right: 10.w),// , top: 20.w, bottom: 20.w + padding: EdgeInsets.only( + left: 20.w, right: 10.w), // , top: 20.w, bottom: 20.w child: Row( children: [ - SizedBox(width:20.w), - Expanded(child: Text(leftTitel!, style: TextStyle(fontSize: 28.sp, fontWeight: FontWeight.w500))), - SizedBox(width:20.w), + SizedBox(width: 20.w), + Expanded( + child: Text(leftTitel!, + style: TextStyle( + fontSize: 28.sp, fontWeight: FontWeight.w500))), + SizedBox(width: 20.w), Row( mainAxisAlignment: MainAxisAlignment.end, children: [ - isHaveRightWidget!?rightWidget!:Text(rightTitle!, textAlign: TextAlign.end, style: TextStyle(fontSize: 28.sp, fontWeight: FontWeight.w500),) + isHaveRightWidget! + ? rightWidget! + : Text( + rightTitle!, + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 28.sp, fontWeight: FontWeight.w500), + ) ], ), - SizedBox(width:5.w), - isHaveDirection!?Image.asset('images/icon_right.png', width: 50.w, height: 50.w,):SizedBox(width:10.w), + SizedBox(width: 5.w), + isHaveDirection! + ? Image.asset( + 'images/icon_right.png', + width: 50.w, + height: 50.w, + ) + : SizedBox(width: 10.w), // SizedBox(width:10.w), ], ), ), - isHaveLine!?Container(height: 0.5.h, color: Colors.grey,):Container() + // isHaveLine!?Container(height: 0.5.h, color: Colors.grey,):Container() + //by DaisyWu + isHaveLine! + ? Divider( + color: AppColors.greyLineColor, + indent: 20.w, + endIndent: 20.w, + height: 1, + ) + : Container() ], ), ); diff --git a/star_lock/lib/translations/lanKeyEntity.dart b/star_lock/lib/translations/lanKeyEntity.dart index dd814104..ddf9fac9 100644 --- a/star_lock/lib/translations/lanKeyEntity.dart +++ b/star_lock/lib/translations/lanKeyEntity.dart @@ -12,7 +12,6 @@ class LanKeyEntity { this.number, this.additive, this.addTime, - this.reset, this.sendKey, this.timeLimit, @@ -41,7 +40,6 @@ class LanKeyEntity { this.fridayShort, this.saturdayShort, this.sundayShort, - this.realNameAuthentication, this.sendKeyBottomTip, this.send, @@ -85,7 +83,6 @@ class LanKeyEntity { this.earlyArrivalList, this.lateList, this.hardWorkingList, - this.basicInformation, this.wirelessKeyboard, this.doorMagnetic, @@ -184,7 +181,6 @@ class LanKeyEntity { this.beLate, this.leaveEarly, this.noCardPunched, - this.lanEnglish, this.lanChinese, this.multilingual, @@ -194,7 +190,6 @@ class LanKeyEntity { this.supportStaff, this.set, this.moreServices, - this.moreSet, this.prompTone, this.touchUnlock, @@ -204,7 +199,6 @@ class LanKeyEntity { this.lockGroup, this.transferSmartLock, this.transferGateway, - this.multiLanguage, this.lockScreen, this.closed, @@ -238,7 +232,7 @@ class LanKeyEntity { this.problemTwo, this.problemThree, this.pleaseEnterYourAnswer, - + this.aboutToExpire, this.designation, this.state, this.wifiName, @@ -268,7 +262,6 @@ class LanKeyEntity { this.preferredDNS, this.alternativeDNS, this.noStaticIPIsUsed, - this.allLock, this.searchAllLockType, this.doorLock, @@ -284,7 +277,6 @@ class LanKeyEntity { this.nearbyLock, this.addSuccessfullyPleaseRename, this.whenAddingLockThePhoneMustBeNextToTheLock, - this.login, this.register, this.forgetPassword, @@ -295,20 +287,17 @@ class LanKeyEntity { this.email, this.countryAndRegion, this.selet, - this.businessCooperation, this.officialWebsite, this.computerWebVersion, this.hotelSystem, this.manualWebVersion, this.introduce, - this.note, this.mail, this.advancedFunction, this.pushMessage, this.recordsRetention, - this.smsBuyTip, this.emailBuyTip, this.currentRemainingQuantity, @@ -316,14 +305,12 @@ class LanKeyEntity { this.customSMSTemplate, this.customMailTemplate, this.record, - this.buyRealNameTip, this.buyRealNameSeletYouWantBuyTip, this.forTheFirstTime, this.onceDay, this.weekOnce, this.monthOnce, - this.currentState, this.onTrial, this.haveNotOpened, @@ -335,7 +322,6 @@ class LanKeyEntity { this.tipsForBuyingAdvancedFeatures, this.freeTrial, this.openNow, - this.buySMS, this.buyMail, this.buyRealNameAuthenticationTimes, @@ -344,7 +330,6 @@ class LanKeyEntity { this.modeOfPayment, this.alipay, this.goToPay, - this.customTemplatesTip, this.haveOpened, this.unHaveOpenedTip1, @@ -367,12 +352,10 @@ class LanKeyEntity { this.and, this.willBeReplacedWithTheActualValue, this.downloadLink, - this.lockScreenTip, this.hideInvalidUnlockPermissionsTip, this.appUnlockRequiresMobilePhoneAccessToTheLockTip, this.checkAll, - }); LanKeyEntity.fromJson(dynamic json) { @@ -520,8 +503,10 @@ class LanKeyEntity { whenScreenFlashesClickNext = json['whenScreenFlashesClickNext']; theScreenNeverFlickered = json['theScreenNeverFlickered']; enterNumberOrPressSet = json['enterNumberOrPressSet']; - theLocationOfTheSetKeyWillBeDifferent = json['theLocationOfTheSetKeyWillBeDifferent']; - pressAndHoldTheResetButtonTwoSeconds = json['pressAndHoldTheResetButtonTwoSeconds']; + theLocationOfTheSetKeyWillBeDifferent = + json['theLocationOfTheSetKeyWillBeDifferent']; + pressAndHoldTheResetButtonTwoSeconds = + json['pressAndHoldTheResetButtonTwoSeconds']; nearbyEquipment = json['nearbyEquipment']; noData = json['noData']; doorMagneticListTopTip = json['doorMagneticListTopTip']; @@ -586,12 +571,14 @@ class LanKeyEntity { closed = json['closed']; opened = json['opened']; hideInvalidUnlockPermissions = json['hideInvalidUnlockPermissions']; - appUnlockRequiresMobilePhoneAccessToTheLock = json['appUnlockRequiresMobilePhoneAccessToTheLock']; + appUnlockRequiresMobilePhoneAccessToTheLock = + json['appUnlockRequiresMobilePhoneAccessToTheLock']; valueAddedServices = json['valueAddedServices']; about = json['about']; userAgreement = json['userAgreement']; privacyPolicy = json['privacyPolicy']; - personalInformationCollectionList = json['personalInformationCollectionList']; + personalInformationCollectionList = + json['personalInformationCollectionList']; applicationPermissionDescription = json['applicationPermissionDescription']; thirdPartyInformationSharingList = json['thirdPartyInformationSharingList']; logout = json['logout']; @@ -614,6 +601,7 @@ class LanKeyEntity { problemTwo = json['problemTwo']; problemThree = json['problemThree']; pleaseEnterYourAnswer = json['pleaseEnterYourAnswer']; + aboutToExpire = json['aboutToExpire']; designation = json['designation']; state = json['state']; @@ -642,12 +630,12 @@ class LanKeyEntity { ipAddress = json['ipAddress']; subnetMask = json['subnetMask']; defaultGateway = json['defaultGateway']; - automaticallyGetTheDNSServerAddress = json['automaticallyGetTheDNSServerAddress']; + automaticallyGetTheDNSServerAddress = + json['automaticallyGetTheDNSServerAddress']; preferredDNS = json['preferredDNS']; alternativeDNS = json['alternativeDNS']; noStaticIPIsUsed = json['noStaticIPIsUsed']; - allLock = json['allLock']; searchAllLockType = json['searchAllLockType']; doorLock = json['doorLock']; @@ -662,7 +650,8 @@ class LanKeyEntity { next = json['next']; nearbyLock = json['nearbyLock']; addSuccessfullyPleaseRename = json['addSuccessfullyPleaseRename']; - whenAddingLockThePhoneMustBeNextToTheLock = json['whenAddingLockThePhoneMustBeNextToTheLock']; + whenAddingLockThePhoneMustBeNextToTheLock = + json['whenAddingLockThePhoneMustBeNextToTheLock']; login = json['login']; register = json['register']; @@ -706,7 +695,8 @@ class LanKeyEntity { currentState = json['currentState']; onTrial = json['onTrial']; haveNotOpened = json['haveNotOpened']; - advancedFeaturesAndBenefitsContent = json['advancedFeaturesAndBenefitsContent']; + advancedFeaturesAndBenefitsContent = + json['advancedFeaturesAndBenefitsContent']; smsTemplate = json['smsTemplate']; emailTemplate = json['emailTemplate']; cardIssuingtool = json['cardIssuingtool']; @@ -749,7 +739,8 @@ class LanKeyEntity { lockScreenTip = json['lockScreenTip']; hideInvalidUnlockPermissionsTip = json['hideInvalidUnlockPermissionsTip']; - appUnlockRequiresMobilePhoneAccessToTheLockTip = json['appUnlockRequiresMobilePhoneAccessToTheLockTip']; + appUnlockRequiresMobilePhoneAccessToTheLockTip = + json['appUnlockRequiresMobilePhoneAccessToTheLockTip']; checkAll = json['checkAll']; } String? starLock; @@ -990,6 +981,7 @@ class LanKeyEntity { String? problemTwo; String? problemThree; String? pleaseEnterYourAnswer; + String? aboutToExpire; String? designation; String? state; @@ -1275,8 +1267,10 @@ class LanKeyEntity { map['whenScreenFlashesClickNext'] = whenScreenFlashesClickNext; map['theScreenNeverFlickered'] = theScreenNeverFlickered; map['enterNumberOrPressSet'] = enterNumberOrPressSet; - map['theLocationOfTheSetKeyWillBeDifferent'] = theLocationOfTheSetKeyWillBeDifferent; - map['pressAndHoldTheResetButtonTwoSeconds'] = pressAndHoldTheResetButtonTwoSeconds; + map['theLocationOfTheSetKeyWillBeDifferent'] = + theLocationOfTheSetKeyWillBeDifferent; + map['pressAndHoldTheResetButtonTwoSeconds'] = + pressAndHoldTheResetButtonTwoSeconds; map['nearbyEquipment'] = nearbyEquipment; map['noData'] = noData; map['doorMagneticListTopTip'] = doorMagneticListTopTip; @@ -1337,12 +1331,14 @@ class LanKeyEntity { map['closed'] = closed; map['opened'] = opened; map['hideInvalidUnlockPermissions'] = hideInvalidUnlockPermissions; - map['appUnlockRequiresMobilePhoneAccessToTheLock'] = appUnlockRequiresMobilePhoneAccessToTheLock; + map['appUnlockRequiresMobilePhoneAccessToTheLock'] = + appUnlockRequiresMobilePhoneAccessToTheLock; map['valueAddedServices'] = valueAddedServices; map['about'] = about; map['userAgreement'] = userAgreement; map['privacyPolicy'] = privacyPolicy; - map['personalInformationCollectionList'] = personalInformationCollectionList; + map['personalInformationCollectionList'] = + personalInformationCollectionList; map['applicationPermissionDescription'] = applicationPermissionDescription; map['thirdPartyInformationSharingList'] = thirdPartyInformationSharingList; map['logout'] = logout; @@ -1366,6 +1362,7 @@ class LanKeyEntity { map['problemTwo'] = problemTwo; map['problemThree'] = problemThree; map['pleaseEnterYourAnswer'] = pleaseEnterYourAnswer; + map['aboutToExpire'] = aboutToExpire; map['designation'] = designation; map['state'] = state; @@ -1392,7 +1389,8 @@ class LanKeyEntity { map['ipAddress'] = ipAddress; map['subnetMask'] = subnetMask; map['defaultGateway'] = defaultGateway; - map['automaticallyGetTheDNSServerAddress'] = automaticallyGetTheDNSServerAddress; + map['automaticallyGetTheDNSServerAddress'] = + automaticallyGetTheDNSServerAddress; map['preferredDNS'] = preferredDNS; map['alternativeDNS'] = alternativeDNS; map['noStaticIPIsUsed'] = noStaticIPIsUsed; @@ -1411,7 +1409,8 @@ class LanKeyEntity { map['next'] = next; map['nearbyLock'] = nearbyLock; map['addSuccessfullyPleaseRename'] = addSuccessfullyPleaseRename; - map['whenAddingLockThePhoneMustBeNextToTheLock'] = whenAddingLockThePhoneMustBeNextToTheLock; + map['whenAddingLockThePhoneMustBeNextToTheLock'] = + whenAddingLockThePhoneMustBeNextToTheLock; map['login'] = login; map['register'] = register; @@ -1455,7 +1454,8 @@ class LanKeyEntity { map['currentState'] = currentState; map['onTrial'] = onTrial; map['haveNotOpened'] = haveNotOpened; - map['advancedFeaturesAndBenefitsContent'] = advancedFeaturesAndBenefitsContent; + map['advancedFeaturesAndBenefitsContent'] = + advancedFeaturesAndBenefitsContent; map['smsTemplate'] = smsTemplate; map['emailTemplate'] = emailTemplate; map['cardIssuingtool'] = cardIssuingtool; @@ -1498,9 +1498,10 @@ class LanKeyEntity { map['lockScreenTip'] = lockScreenTip; map['hideInvalidUnlockPermissionsTip'] = hideInvalidUnlockPermissionsTip; - map['appUnlockRequiresMobilePhoneAccessToTheLockTip'] = appUnlockRequiresMobilePhoneAccessToTheLockTip; + map['appUnlockRequiresMobilePhoneAccessToTheLockTip'] = + appUnlockRequiresMobilePhoneAccessToTheLockTip; map['checkAll'] = checkAll; return map; } -} \ No newline at end of file +}