diff --git a/lib/appRouters.dart b/lib/appRouters.dart index 858591c2..3e24cdca 100755 --- a/lib/appRouters.dart +++ b/lib/appRouters.dart @@ -196,884 +196,884 @@ import 'starLockApplication/starLockApplication.dart'; import 'tools/seletKeyCyclicDate/seletKeyCyclicDate_page.dart'; abstract class Routers { - static const initial = '/'; // 加载页 - static const starLockMain = '/StarLockMain'; // 首页 - static const starLockMinePage = '/StarLockMinePage'; // 我的 - static const selectLockTypePage = '/SelectLockTypePage'; // 选择锁类型 - static const lockMallPage = '/LockMallPage'; // 商城页面 - static const addLockPage = '/AddLockPage'; // 选择锁类型 - static const nearbyLockPage = '/NearbyLockPage'; // 附近的锁 - static const lockAddressPage = '/LockAddressPage'; // 锁地址 - static const lockAddressGaoDePage = '/LockAddressGaoDePage'; // 锁地址-高德 - static const saveLockPage = '/SaveLockPage'; // 保存锁 - static const lockDetailMainPage = '/LockDetailMainPage'; // 锁详情 - static const electronicKeyListPage = '/ElectronicKeyListPage'; // 电子钥匙列表 - static const electronicKeyDetailPage = '/ElectronicKeyDetailPage'; // 电子钥匙详情 - static const electronicKeyDetailChangeDate = + static const String initial = '/'; // 加载页 + static const String starLockMain = '/StarLockMain'; // 首页 + static const String starLockMinePage = '/StarLockMinePage'; // 我的 + static const String selectLockTypePage = '/SelectLockTypePage'; // 选择锁类型 + static const String lockMallPage = '/LockMallPage'; // 商城页面 + static const String addLockPage = '/AddLockPage'; // 选择锁类型 + static const String nearbyLockPage = '/NearbyLockPage'; // 附近的锁 + static const String lockAddressPage = '/LockAddressPage'; // 锁地址 + static const String lockAddressGaoDePage = '/LockAddressGaoDePage'; // 锁地址-高德 + static const String saveLockPage = '/SaveLockPage'; // 保存锁 + static const String lockDetailMainPage = '/LockDetailMainPage'; // 锁详情 + static const String electronicKeyListPage = '/ElectronicKeyListPage'; // 电子钥匙列表 + static const String electronicKeyDetailPage = '/ElectronicKeyDetailPage'; // 电子钥匙详情 + static const String electronicKeyDetailChangeDate = '/ElectronicKeyDetailChangeDate'; // 修改有效期 - static const sendElectronicKeyPage = '/SendElectronicKeyPage'; // 发送电子钥匙 - static const massSendElectronicKeyManagePage = + static const String sendElectronicKeyPage = '/SendElectronicKeyPage'; // 发送电子钥匙 + static const String massSendElectronicKeyManagePage = '/MassSendElectronicKeyManagePage'; // 群发钥匙 - static const electronicKeyPeriodValidityPage = + static const String electronicKeyPeriodValidityPage = '/ElectronicKeyPeriodValidityPage'; // 电子钥匙有效期 - static const sendEmailNotificationPage = '/SendEmailNotificationPage'; // 邮件通知 - static const passwordKeyListPage = '/PasswordKeyListPage'; // 密码钥匙列表 - static const passwordKeyPerpetualPage = '/PasswordKeyPerpetualPage'; // 密码钥匙 - static const passwordKeyDetailPage = '/PasswordKeyDetailPage'; // 密码钥匙详情 + static const String sendEmailNotificationPage = '/SendEmailNotificationPage'; // 邮件通知 + static const String passwordKeyListPage = '/PasswordKeyListPage'; // 密码钥匙列表 + static const String passwordKeyPerpetualPage = '/PasswordKeyPerpetualPage'; // 密码钥匙 + static const String passwordKeyDetailPage = '/PasswordKeyDetailPage'; // 密码钥匙详情 // static const otherTypeKeyListPage = '/OtherTypeKeyListPage'; // 卡、指纹、遥控钥匙列表 // static const otherTypeKeyDetailPage = '/OtherTypeKeyDetailPage'; // 卡、指纹、遥控钥匙详情 // static const otherTypeKeyManagePage = '/OtherTypeKeyManagePage'; // 卡、指纹、遥控钥匙添加 - static const otherTypeKeyChangeDatePage = + static const String otherTypeKeyChangeDatePage = '/OtherTypeKeyChangeDatePage'; // 卡、指纹、遥控钥匙详情修改日期 - static const otherTypeKeyChangeValidityDatePage = + static const String otherTypeKeyChangeValidityDatePage = '/OtherTypeKeyChangeValidityDatePage'; // 卡、指纹、遥控钥匙详情修改有效期 - static const addFingerprintTipPage = '/AddFingerprintTipPage'; // 添加指纹提示 - static const addFingerprintPage = '/AddFingerprintPage'; // 添加指纹 - static const addICCardPage = '/AddICCardPage'; // 添加卡 + static const String addFingerprintTipPage = '/AddFingerprintTipPage'; // 添加指纹提示 + static const String addFingerprintPage = '/AddFingerprintPage'; // 添加指纹 + static const String addICCardPage = '/AddICCardPage'; // 添加卡 - static const authorizedAdminListPage = '/AuthorizedAdminListPage'; // 授权管理员列表 - static const authorizedAdminDetailPage = + static const String authorizedAdminListPage = '/AuthorizedAdminListPage'; // 授权管理员列表 + static const String authorizedAdminDetailPage = '/AuthorizedAdminDetailPage'; // 授权管理员详情 - static const authorizedAdminPage = '/AuthorizedAdminPage'; // 授权管理员 - static const volumeAuthorizationLockManagePage = + static const String authorizedAdminPage = '/AuthorizedAdminPage'; // 授权管理员 + static const String volumeAuthorizationLockManagePage = '/VolumeAuthorizationLockManagePage'; // 批量授权锁 - static const lockOperatingRecordPage = '/LockOperatingRecordPage'; // 操作记录 - static const lockSetPage = '/LockSetPage'; // 锁设置 - static const basicInformationPage = '/BasicInformationPage'; // 基本信息 - static const uploadElectricQuantityPage = + static const String lockOperatingRecordPage = '/LockOperatingRecordPage'; // 操作记录 + static const String lockSetPage = '/LockSetPage'; // 锁设置 + static const String basicInformationPage = '/BasicInformationPage'; // 基本信息 + static const String uploadElectricQuantityPage = '/UploadElectricQuantityPage'; // 更新锁电量 - static const editLockNamePage = '/EditLockNamePage'; // 修改锁名字 - static const lockSelectGroupingPage = '/LockSelectGroupingPage'; // 锁选择分组 - static const groupEditLockPage = '/GroupEditLockPage'; // 编辑锁分组里面的锁 - static const adminOpenLockPasswordPage = + static const String editLockNamePage = '/EditLockNamePage'; // 修改锁名字 + static const String lockSelectGroupingPage = '/LockSelectGroupingPage'; // 锁选择分组 + static const String groupEditLockPage = '/GroupEditLockPage'; // 编辑锁分组里面的锁 + static const String adminOpenLockPasswordPage = '/AdminOpenLockPasswordPage'; // 管理员开锁密码 - static const wirelessKeyboardPage = '/WirelessKeyboardPage'; // 蓝牙键盘 - static const addWirelessKeyboardPage = '/AddWirelessKeyboardPage'; // 添加蓝牙键盘 - static const addWirelessKeyboardScreenNotLightOnPage = + static const String wirelessKeyboardPage = '/WirelessKeyboardPage'; // 蓝牙键盘 + static const String addWirelessKeyboardPage = '/AddWirelessKeyboardPage'; // 添加蓝牙键盘 + static const String addWirelessKeyboardScreenNotLightOnPage = '/AddWirelessKeyboardScreenNotLightOnPage'; // 添加蓝牙键盘屏幕不亮时提示 - static const selectWirelessKeyboardPage = + static const String selectWirelessKeyboardPage = '/SelectWirelessKeyboardPage'; // 选择蓝牙键盘 - 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 wifiListPage = '/WifiListPage'; // WiFi列表 - static const configuringWifiPage = '/ConfiguringWifiPage'; // 配置WiFi - 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 checkInCreatCompanyPage = '/CheckInCreatCompanyPage'; // 创建公司 - static const checkingInListPage = '/CheckingInListPage'; // 考勤 - static const checkingInSetPage = '/CheckingInSetPage'; // 考勤设置 - static const checkingInStaffManagePage = '/CheckingInStaffManagePage'; // 员工管理 - static const checkingInAddStaffPage = '/CheckingInAddStaffPage'; // 添加员工 - static const checkingInStaffDetailPage = '/CheckingInStaffDetailPage'; // 编辑员工 - static const checkingInSetWorkTimePage = + static const String doorMagneticPage = '/DoorMagneticPage'; // 门磁列表 + static const String addDoorMagneticPage = '/AddDoorMagneticPage'; // 添加门磁 + static const String nearbyDoorMagneticPage = '/NearbyDoorMagneticPage'; // 附近的门磁 + static const String remoteUnlockingPage = '/RemoteUnlockingPage'; // 远程开锁 + static const String automaticBlockingPage = '/AutomaticBlockingPage'; // 自动闭锁 + static const String normallyOpenModePage = '/NormallyOpenModePage'; // 常开模式 + static const String lockSoundSetPage = '/LockSoundSetPage'; // 锁声音 + static const String burglarAlarmPage = '/BurglarAlarmPage'; // 防撬警报 + static const String resetButtonPage = '/ResetButtonPage'; // 锁重置键 + static const String unlockQRCodePage = '/UnlockQRCodePage'; // 开锁二维码 + static const String wifiListPage = '/WifiListPage'; // WiFi列表 + static const String configuringWifiPage = '/ConfiguringWifiPage'; // 配置WiFi + static const String lockTimePage = '/LockTimePage'; // 锁时间 + static const String diagnosePage = '/DiagnosePage'; // 诊断 + static const String uploadDataPage = '/UploadDataPage'; // 上传数据 + static const String importOtherLockDataPage = '/ImportOtherLockDataPage'; // 导入其他锁数据 + static const String lockEscalationPage = '/LockEscalationPage'; // 锁升级 + static const String markedHouseStatePage = '/MarkedHouseStatePage'; // 标记房态 + static const String checkInCreatCompanyPage = '/CheckInCreatCompanyPage'; // 创建公司 + static const String checkingInListPage = '/CheckingInListPage'; // 考勤 + static const String checkingInSetPage = '/CheckingInSetPage'; // 考勤设置 + static const String checkingInStaffManagePage = '/CheckingInStaffManagePage'; // 员工管理 + static const String checkingInAddStaffPage = '/CheckingInAddStaffPage'; // 添加员工 + static const String checkingInStaffDetailPage = '/CheckingInStaffDetailPage'; // 编辑员工 + static const String checkingInSetWorkTimePage = '/CheckingInSetWorkTimePage'; // 工作时间设置 - static const checkingInSetWorkdaySet = '/CheckingInSetWorkdaySet'; // 工作日设置 - static const checkingInSetHolidaysPage = + static const String checkingInSetWorkdaySet = '/CheckingInSetWorkdaySet'; // 工作日设置 + static const String checkingInSetHolidaysPage = '/CheckingInSetHolidaysPage'; // 节假日设置 - static const checkingInAddHolidaysPage = '/CheckingInAddHolidaysPage'; // 添加假日 - static const checkingInDetailPage = '/CheckingInDetailPage'; // 考勤详情 - static const checkingInDeletHolidaysPage = + static const String checkingInAddHolidaysPage = '/CheckingInAddHolidaysPage'; // 添加假日 + static const String checkingInDetailPage = '/CheckingInDetailPage'; // 考勤详情 + static const String checkingInDeletHolidaysPage = '/CheckingInDeletHolidaysPage'; // 删除考勤 - static const mineSetPage = '/MineSetPage'; // 我的设置 - static const mineMultiLanguagePage = '/MineMultiLanguagePage'; // 我的设置 - static const minePersonInfoPage = '/MinePersonInfoPage'; // 我的信息 - static const minePersonInfoEditNamePage = + static const String mineSetPage = '/MineSetPage'; // 我的设置 + static const String mineMultiLanguagePage = '/MineMultiLanguagePage'; // 我的设置 + static const String minePersonInfoPage = '/MinePersonInfoPage'; // 我的信息 + static const String minePersonInfoEditNamePage = '/MinePersonInfoEditNamePage'; // 我的信息编辑昵称 - static const mineUnbindPhoneOrEmailPage = + static const String mineUnbindPhoneOrEmailPage = '/MineUnbindPhoneOrEmailPage'; // 我的信息修改账号-解绑 - static const minePersonInfoEditAccountNextPage = + static const String minePersonInfoEditAccountNextPage = '/MinePersonInfoEditAccountNextPage'; // 我的信息修改账号下一页 - static const minePersonInfoEditIphonePage = + static const String minePersonInfoEditIphonePage = '/MinePersonInfoEditIphonePage'; // 我的信息修改手机号 - static const minePersonInfoResetPasswordPage = + static const String minePersonInfoResetPasswordPage = '/MinePersonInfoResetPasswordPage'; // 我的信息重置密码 - static const minePersonInfoSetSafetyProblemPage = + static const String minePersonInfoSetSafetyProblemPage = '/MinePersonInfoSetSafetyProblemPage'; // 我的信息设置安全问题 - static const minePersonInfoViewSafetyProblemPage = + static const String minePersonInfoViewSafetyProblemPage = '/MinePersonInfoViewSafetyProblemPage'; // 查看我的安全问题 - static const mineBindPhoneOrEmailPage = '/MineBindPhoneOrEmailPage'; //我的信息-邮箱 + static const String mineBindPhoneOrEmailPage = '/MineBindPhoneOrEmailPage'; //我的信息-邮箱 - static const gatewayListPage = '/GatewayListPage'; // 我的-网关 - static const gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 - static const gatewayConnectionLockPage = + static const String gatewayListPage = '/GatewayListPage'; // 我的-网关 + static const String gatewayDetailPage = '/GatewayDetailPage'; // 我的-网关详情 + static const String gatewayConnectionLockPage = '/GatewayConnectionLockPage'; // 我的-网关网关链接的锁 - static const selectGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 - static const selectGatewayTypeNextTipPage = + static const String selectGatewayTypePage = '/SelectGatewayTypePage'; // 我的-选择网关类型 + static const String selectGatewayTypeNextTipPage = '/SelectGatewayTypeNextTipPage'; // 我的-选择网关类型下一步 - static const selectGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 - static const gatewayConfigurationWifiPage = + static const String selectGatewayPage = '/SelectGatewayPage'; // 我的-选择网关 + static const String gatewayConfigurationWifiPage = '/GatewayConfigurationWifiPage'; // 我的-网关配置wifi - static const messageListPage = '/MessageListPage'; // 我的-消息 - static const messageDetailPage = '/MessageDetailPage'; // 我的-消息详情 - static const supportStaffPage = '/SupportStaffPage'; // 我的-客服 - static const valueAddedServicesPage = '/ValueAddedServicesPage'; // 我的-增值服务 - static const aboutPage = '/AboutPage'; // 我的-关于 + static const String messageListPage = '/MessageListPage'; // 我的-消息 + static const String messageDetailPage = '/MessageDetailPage'; // 我的-消息详情 + static const String supportStaffPage = '/SupportStaffPage'; // 我的-客服 + static const String valueAddedServicesPage = '/ValueAddedServicesPage'; // 我的-增值服务 + static const String aboutPage = '/AboutPage'; // 我的-关于 - static const valueAddedServicesNoteAndEmailDetailPage = + static const String valueAddedServicesNoteAndEmailDetailPage = '/ValueAddedServicesNoteAndEmailDetailPage'; // 增值服务-短信邮件详情 - static const valueAddedServicesRealNamePage = + static const String valueAddedServicesRealNamePage = '/ValueAddedServicesRealNamePage'; // 增值服务-实名认证详情 - static const valueAddedServicesRecordPage = + static const String valueAddedServicesRecordPage = '/valueAddedServicesRecordPage'; // 增值服务-记录 - static const valueAddedServicesHighFunctionPage = + static const String valueAddedServicesHighFunctionPage = '/ValueAddedServicesHighFunctionPage'; // 增值服务-高级功能 - static const valueAddedServicesBuyPage = + static const String valueAddedServicesBuyPage = '/ValueAddedServicesBuyPage'; // 增值服务-购买服务 - static const valueAddedServicesListSMSTemplatePage = + static const String valueAddedServicesListSMSTemplatePage = '/ValueAddedServicesListSMSTemplatePage'; // 增值服务-短信模版列表 - static const valueAddedServicesAddSMSTemplatePage = + static const String valueAddedServicesAddSMSTemplatePage = '/valueAddedServicesAddSMSTemplatePage'; // 增值服务-自定义短信模版 - static const valueAddedServicesListEmailTemplatePage = + static const String valueAddedServicesListEmailTemplatePage = '/ValueAddedServicesListEmailTemplatePage'; // 增值服务-邮箱模版列表 - static const valueAddedServicesAddEmailTemplatePage = + static const String valueAddedServicesAddEmailTemplatePage = '/ValueAddedServicesAddEmailTemplatePage'; // 增值服务-自定义邮箱模版 - static const valueAddedServicesBuyAndUseRecordManagePage = + static const String valueAddedServicesBuyAndUseRecordManagePage = '/ValueAddedServicesBuyAndUseRecordManagePage'; // 增值服务-购买使用记录 - static const lockScreenPage = '/LockScreenPage'; // 我的设置-锁屏 - static const aPPUnlockNeedMobileNetworkingLockPage = + static const String lockScreenPage = '/LockScreenPage'; // 我的设置-锁屏 + static const String aPPUnlockNeedMobileNetworkingLockPage = '/APPUnlockNeedMobileNetworkingLockPage'; // 我的设置-app开锁时需手机连网的锁 - static const hideInvalidUnlockPermissionsPage = + static const String hideInvalidUnlockPermissionsPage = '/HideInvalidUnlockPermissionsPage'; // 我的设置-隐藏无效开锁权限 - static const lockUserManageLisPage = '/LockUserManageLisPage'; //我的设置-锁用户管理 - static const authorizedAdministratorListPage = + static const String lockUserManageLisPage = '/LockUserManageLisPage'; //我的设置-锁用户管理 + static const String authorizedAdministratorListPage = '/AuthorizedAdministratorListPage'; //我的设置-授权管理员 - static const lockGroupListPage = '/LockGroupListPage'; //我的设置-锁分组 - static const lockItemListPage = '/LockItemListPage'; //锁分组-锁列表 - static const transferSmartLockPage = '/transferSmartLockPage'; //转移智能锁 - static const recipientInformationPage = '/recipientInformationPage'; //接受人信息 - static const selectBranchPage = '/SelectBranchPage'; //选择分店 - static const selectGetewayListPage = '/selectGetewayListPage'; //选择网关 - static const addAuthorizedAdministratorPage = + static const String lockGroupListPage = '/LockGroupListPage'; //我的设置-锁分组 + static const String lockItemListPage = '/LockItemListPage'; //锁分组-锁列表 + static const String transferSmartLockPage = '/transferSmartLockPage'; //转移智能锁 + static const String recipientInformationPage = '/recipientInformationPage'; //接受人信息 + static const String selectBranchPage = '/SelectBranchPage'; //选择分店 + static const String selectGetewayListPage = '/selectGetewayListPage'; //选择网关 + static const String addAuthorizedAdministratorPage = '/addAuthorizedAdministratorPage'; //添加授权管理员 - static const ownedKeyListPage = '/ownedKeyListPage'; //拥有的钥匙 + static const String ownedKeyListPage = '/ownedKeyListPage'; //拥有的钥匙 - static const starLockLoginPage = '/StarLockLoginPage'; // 登录 - static const starLockRegisterPage = '/StarLockRegisterPage'; // 注册 - static const starLockForgetPasswordPage = + static const String starLockLoginPage = '/StarLockLoginPage'; // 登录 + static const String starLockRegisterPage = '/StarLockRegisterPage'; // 注册 + static const String starLockForgetPasswordPage = '/StarLockForgetPasswordPage'; // 忘记密码 - static const selectCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 - static const safetyVerificationPage = '/SafetyVerificationPage'; // 安全验证 + static const String selectCountryRegionPage = '/SelectCountryRegionPage'; // 选择国家和地区 + static const String safetyVerificationPage = '/SafetyVerificationPage'; // 安全验证 - static const getDeviceListPage = '/getDeviceListPage'; //设备列表 - static const getNameListPage = '/getNameListPage'; //姓名列表 - static const authorityManagementPage = '/authorityManagementPage'; //批量授权 - static const massSendLockGroupListPage = + static const String getDeviceListPage = '/getDeviceListPage'; //设备列表 + static const String getNameListPage = '/getNameListPage'; //姓名列表 + static const String authorityManagementPage = '/authorityManagementPage'; //批量授权 + static const String massSendLockGroupListPage = '/massSendLockGroupListPage'; //群发锁分组列表 - static const massSendReceiverPage = '/massSendReceiverPage'; //群发接收人 - static const lockUserListPage = '/lockUserListPage'; //锁用户列表 - static const administratorDetailsPage = '/administratorDetailsPage'; //管理员详情 - static const expireLockManagePage = '/expireLockManagePage'; //即将到期 - static const adminDetailChangeDatePage = + static const String massSendReceiverPage = '/massSendReceiverPage'; //群发接收人 + static const String lockUserListPage = '/lockUserListPage'; //锁用户列表 + static const String administratorDetailsPage = '/administratorDetailsPage'; //管理员详情 + static const String expireLockManagePage = '/expireLockManagePage'; //即将到期 + static const String adminDetailChangeDatePage = '/adminDetailChangeDatePage'; //管理员详情修改生效时间 - static const adminLockListPage = '/adminLockListPage'; //管理员详情的锁列表 - static const safeVerifyPage = '/safeVerifyPage'; //删除账号安全验证 - static const webviewShowPage = '/webviewShowPage'; //网页 - static const demoModeLockDetailPage = '/DemoModeLockDetailPage'; // 演示模式锁详情页 - static const demoModeLockSetPage = '/DemoModeLockSetPage'; // 演示模式锁设置页 - static const addLockSelectCountryPage = + static const String adminLockListPage = '/adminLockListPage'; //管理员详情的锁列表 + static const String safeVerifyPage = '/safeVerifyPage'; //删除账号安全验证 + static const String webviewShowPage = '/webviewShowPage'; //网页 + static const String demoModeLockDetailPage = '/DemoModeLockDetailPage'; // 演示模式锁详情页 + static const String demoModeLockSetPage = '/DemoModeLockSetPage'; // 演示模式锁设置页 + static const String addLockSelectCountryPage = '/AddLockSelectCountryPage'; // 演示模式锁设置页 - static const faceUnlockPage = '/faceUnlockPage'; //面容开锁设置 - static const motorPowerPage = '/motorPowerPage'; //电机功率设置 - static const openDoorDirectionPage = '/openDoorDirectionPage'; //开门方向设置 - static const catEyeWorkModePage = '/catEyeWorkModePage'; //猫眼工作模式 - static const msgNotificationPage = '/msgNotificationPage'; //消息提醒 - static const addFacePage = '/addFacePage'; //添加人脸 - static const nDaysUnopenedPage = '/nDaysUnopenedPage'; //N天未开门 - static const notificationModePage = '/notificationModePage'; //提醒方式 - static const openDoorNotifyPage = '/openDoorNotifyPage'; //家人到家 - static const addFamilyPage = '/addFamilyPage'; //添加家人 - static const lockUserPage = '/lockUserPage'; //锁用户 - static const catEyeSetPage = '/catEyeSetPage'; //猫眼设置 - static const coerceOpenDoorPage = '/coerceOpenDoorPage'; //胁迫开门 - static const coerceFingerprintPage = '/coerceFingerprintPage'; //胁迫指纹 - static const lowBatteryReminderPage = '/lowBatteryReminderPage'; //低电量提醒 - static const coerceFingerprintListPage = '/coerceFingerprintListPage'; //指纹列表 - static const lockMonitoringPage = '/LockMonitoringPage'; //监控 - static const monitoringRealTimeScreenPage = + static const String faceUnlockPage = '/faceUnlockPage'; //面容开锁设置 + static const String motorPowerPage = '/motorPowerPage'; //电机功率设置 + static const String openDoorDirectionPage = '/openDoorDirectionPage'; //开门方向设置 + static const String catEyeWorkModePage = '/catEyeWorkModePage'; //猫眼工作模式 + static const String msgNotificationPage = '/msgNotificationPage'; //消息提醒 + static const String addFacePage = '/addFacePage'; //添加人脸 + static const String nDaysUnopenedPage = '/nDaysUnopenedPage'; //N天未开门 + static const String notificationModePage = '/notificationModePage'; //提醒方式 + static const String openDoorNotifyPage = '/openDoorNotifyPage'; //家人到家 + static const String addFamilyPage = '/addFamilyPage'; //添加家人 + static const String lockUserPage = '/lockUserPage'; //锁用户 + static const String catEyeSetPage = '/catEyeSetPage'; //猫眼设置 + static const String coerceOpenDoorPage = '/coerceOpenDoorPage'; //胁迫开门 + static const String coerceFingerprintPage = '/coerceFingerprintPage'; //胁迫指纹 + static const String lowBatteryReminderPage = '/lowBatteryReminderPage'; //低电量提醒 + static const String coerceFingerprintListPage = '/coerceFingerprintListPage'; //指纹列表 + static const String lockMonitoringPage = '/LockMonitoringPage'; //监控 + static const String monitoringRealTimeScreenPage = '/MonitoringRealTimeScreenPage'; //实时画面 - static const videoLogPage = '/VideoLogPage'; // 视频日志 - static const editVideoLogPage = '/EditVideoLogPage'; // 编辑视频日志 - static const videoLogDetailPage = '/VideoLogDetailPage'; // 视频日志详情 - static const videoLogDownLoadPage = '/VideoLogDownLoadPage'; // 视频下载列表 + static const String videoLogPage = '/VideoLogPage'; // 视频日志 + static const String editVideoLogPage = '/EditVideoLogPage'; // 编辑视频日志 + static const String videoLogDetailPage = '/VideoLogDetailPage'; // 视频日志详情 + static const String videoLogDownLoadPage = '/VideoLogDownLoadPage'; // 视频下载列表 - static const remoteControlListPage = '/RemoteControlListPage'; // 遥控列表 - static const addRemoteControlPage = '/AddRemoteControlPage'; // 添加遥控 + static const String remoteControlListPage = '/RemoteControlListPage'; // 遥控列表 + static const String addRemoteControlPage = '/AddRemoteControlPage'; // 添加遥控 - static const cardListPage = '/CardListPage'; // 卡列表 + static const String cardListPage = '/CardListPage'; // 卡列表 // static const addCardTypeManagePage = '/AddCardTypeManagePage'; // 添加卡 - static const addCardPage = '/AddCardPage'; // 添加卡 - static const cardDetailPage = '/CardDetailPage'; // 卡详情 - static const fingerprintListPage = '/FingerprintListPage'; // 指纹列表 - static const addFingerprintTypePage = '/AddFingerprintTypePage'; // 添加指纹 - static const fingerprintDetailPage = '/FingerprintDetailPage'; // 指纹详情 - static const faceListPage = '/FaceListPage'; // 人脸列表 - static const addFaceTypePage = '/AddFaceTypePage'; // 添加人脸 - static const faceDetailPage = '/faceDetailPage'; // 人脸详情 + static const String addCardPage = '/AddCardPage'; // 添加卡 + static const String cardDetailPage = '/CardDetailPage'; // 卡详情 + static const String fingerprintListPage = '/FingerprintListPage'; // 指纹列表 + static const String addFingerprintTypePage = '/AddFingerprintTypePage'; // 添加指纹 + static const String fingerprintDetailPage = '/FingerprintDetailPage'; // 指纹详情 + static const String faceListPage = '/FaceListPage'; // 人脸列表 + static const String addFaceTypePage = '/AddFaceTypePage'; // 添加人脸 + static const String faceDetailPage = '/faceDetailPage'; // 人脸详情 - static const irisListPage = '/IrisListPage'; // 虹膜列表 - static const addIrisTypeManagePage = '/AddIrisTypeManagePage'; // 添加虹膜 - static const addIrisPage = '/AddIrisPage'; // 添加虹膜过程 + static const String irisListPage = '/IrisListPage'; // 虹膜列表 + static const String addIrisTypeManagePage = '/AddIrisTypeManagePage'; // 添加虹膜 + static const String addIrisPage = '/AddIrisPage'; // 添加虹膜过程 - static const palmListPage = '/PalmListPage'; // 手掌列表 - static const addPalmTypeManagePage = '/AddPalmTypeManagePage'; // 添加手掌 - static const addPalmPage = '/AddPalmPage'; // 添加手掌过程 + static const String palmListPage = '/PalmListPage'; // 手掌列表 + static const String addPalmTypeManagePage = '/AddPalmTypeManagePage'; // 添加手掌 + static const String addPalmPage = '/AddPalmPage'; // 添加手掌过程 - static const passwordKeyDetailChangeDatePage = + static const String passwordKeyDetailChangeDatePage = '/passwordKeyDetailChangeDatePage'; //密码更改时间 - static const realTimePicturePage = '/realTimePicturePage'; //实时监控画面 - static const doorLockLogPage = '/doorLockLogPage'; //门锁日志 - static const catEyeCustomModePage = '/catEyeCustomModePage'; //猫眼自定义模式 - static const videoSlotPage = '/videoSlotPage'; //录像时段 - static const liveVideoPage = '/liveVideoPage'; //实时画面 + static const String realTimePicturePage = '/realTimePicturePage'; //实时监控画面 + static const String doorLockLogPage = '/doorLockLogPage'; //门锁日志 + static const String catEyeCustomModePage = '/catEyeCustomModePage'; //猫眼自定义模式 + static const String videoSlotPage = '/videoSlotPage'; //录像时段 + static const String liveVideoPage = '/liveVideoPage'; //实时画面 - static const accessoriesListPage = '/accessoriesListPage'; //配件列表 - static const seletKeyCyclicDatePage = + static const String accessoriesListPage = '/accessoriesListPage'; //配件列表 + static const String seletKeyCyclicDatePage = '/SeletKeyCyclicDatePage'; // 电子钥匙、授权管理员、卡、指纹、遥控等添加添加循环日期公共界面 - static const advancedFeaturesWebPage = '/advancedFeaturesWebPage'; // 高级功能 - static const advancedFunctionRecordPage = + static const String advancedFeaturesWebPage = '/advancedFeaturesWebPage'; // 高级功能 + static const String advancedFunctionRecordPage = '/advancedFunctionRecordPage'; //高级功能购买记录 static const String administratorAssociationLockPage = '/administratorAssociationLockPage'; //我的设置-授权管理员-关联锁 } abstract class AppRouters { - static final routePages = [ - GetPage( + static final List> routePages = >[ + GetPage( name: Routers.initial, page: () => const StarLockApplication(), ), - GetPage( + GetPage( name: Routers.starLockMain, page: () => F.sw( skyCall: () => StarLockMainPage(), xhjCall: () => const StarLockMainXHJPage()), ), - GetPage( + GetPage( name: Routers.starLockMinePage, page: () => const StarLockMinePage(), ), - GetPage( + GetPage( name: Routers.selectLockTypePage, page: () => const SelectLockTypePage(), ), - GetPage( + GetPage( name: Routers.lockMallPage, page: () => LockMallPage(), ), - GetPage( + GetPage( name: Routers.addLockPage, page: () => const AddLockPage(), ), - GetPage( + GetPage( name: Routers.nearbyLockPage, page: () => const NearbyLockPage(), ), - GetPage( + GetPage( name: Routers.saveLockPage, page: () => const SaveLockPage(), ), - GetPage( + GetPage( name: Routers.lockDetailMainPage, page: () => const LockDetailMainPage(), ), - GetPage( + GetPage( name: Routers.electronicKeyListPage, page: () => const ElectronicKeyListPage(), ), - GetPage( + GetPage( name: Routers.electronicKeyDetailPage, page: () => const ElectronicKeyDetailPage(), ), - GetPage( + GetPage( name: Routers.electronicKeyDetailChangeDate, page: () => const ElectronicKeyDetailChangeDate(), ), - GetPage( + GetPage( name: Routers.sendElectronicKeyPage, page: () => const SendElectronicKeyPage(), ), - GetPage( + GetPage( name: Routers.massSendElectronicKeyManagePage, page: () => const MassSendElectronicKeyManagePage(), ), - GetPage( + GetPage( name: Routers.electronicKeyPeriodValidityPage, page: () => const ElectronicKeyPeriodValidityPage(), ), - GetPage( + GetPage( name: Routers.sendEmailNotificationPage, page: () => const SendEmailNotificationPage(), ), - GetPage( + GetPage( name: Routers.passwordKeyListPage, page: () => const PasswordKeyListPage(), ), - GetPage( + GetPage( name: Routers.passwordKeyPerpetualPage, page: () => const PasswordKeyPerpetualPage(), ), - GetPage( + GetPage( name: Routers.passwordKeyDetailPage, page: () => const PasswordKeyDetailPage(), ), - // GetPage( + // GetPage( // name: Routers.otherTypeKeyListPage, // page: () => const OtherTypeKeyListPage(), // ), - // GetPage( + // GetPage( // name: Routers.otherTypeKeyDetailPage, // page: () => const OtherTypeKeyDetailPage(), // ), - // GetPage( + // GetPage( // name: Routers.otherTypeKeyManagePage, // page: () => const OtherTypeKeyManagePage(), // ), - GetPage( + GetPage( name: Routers.authorizedAdminListPage, page: () => const AuthorizedAdminListPage(), ), - GetPage( + GetPage( name: Routers.authorizedAdminPage, page: () => const AuthorizedAdminPage(), ), - GetPage( + GetPage( name: Routers.lockOperatingRecordPage, page: () => const LockOperatingRecordPage(), ), - GetPage( + GetPage( name: Routers.mineSetPage, - page: () => const MineSetPage(), + page: () => MineSetPage(), ), - GetPage( + GetPage( name: Routers.volumeAuthorizationLockManagePage, page: () => const VolumeAuthorizationLockManagePage(), ), - GetPage( + GetPage( name: Routers.mineMultiLanguagePage, page: () => const MineMultiLanguagePage(), ), - GetPage( + GetPage( name: Routers.starLockLoginPage, page: () => F.sw( skyCall: () => const StarLockLoginPage(), xhjCall: () => const StarLockLoginXHJPage()), ), - GetPage( + GetPage( name: Routers.starLockRegisterPage, page: () => F.sw( skyCall: () => const StarLockRegisterPage(), xhjCall: () => const StarLockRegisterXHJPage()), binding: StarLockRegisterBinding()), - GetPage( + GetPage( name: Routers.starLockForgetPasswordPage, page: () => F.sw( skyCall: () => const StarLockForgetPasswordPage(), xhjCall: () => const StarLockForgetPasswordXHJPage()), ), - GetPage( + GetPage( name: Routers.selectCountryRegionPage, page: () => const SelectCountryRegionPage(), ), - GetPage( + GetPage( name: Routers.lockSetPage, page: () => const LockSetPage(), ), - GetPage( + GetPage( name: Routers.basicInformationPage, page: () => const BasicInformationPage(), ), - GetPage( + GetPage( name: Routers.uploadElectricQuantityPage, page: () => const UploadElectricQuantityPage(), ), - GetPage( + GetPage( name: Routers.editLockNamePage, page: () => const EditLockNamePage(), ), - GetPage( + GetPage( name: Routers.lockSelectGroupingPage, page: () => const LockSelectGroupingPage(), ), - GetPage( + GetPage( name: Routers.adminOpenLockPasswordPage, page: () => const AdminOpenLockPasswordPage(), ), - GetPage( + GetPage( name: Routers.wirelessKeyboardPage, page: () => const WirelessKeyboardPage(), ), - GetPage( + GetPage( name: Routers.addWirelessKeyboardPage, page: () => const AddWirelessKeyboardPage(), ), - GetPage( + GetPage( name: Routers.addWirelessKeyboardScreenNotLightOnPage, page: () => const AddWirelessKeyboardScreenNotLightOnPage(), ), - GetPage( + GetPage( name: Routers.selectWirelessKeyboardPage, page: () => const SelectWirelessKeyboardPage(), ), - GetPage( + GetPage( name: Routers.doorMagneticPage, page: () => const DoorMagneticPage(), ), - GetPage( + GetPage( name: Routers.addDoorMagneticPage, page: () => const AddDoorMagneticPage(), ), - GetPage( + GetPage( name: Routers.nearbyDoorMagneticPage, page: () => const NearbyDoorMagneticPage(), ), - GetPage( + GetPage( name: Routers.lockAddressPage, page: () => const LockAddressPage(), ), - GetPage( + GetPage( name: Routers.remoteUnlockingPage, page: () => const RemoteUnlockingPage(), ), - GetPage( + GetPage( name: Routers.automaticBlockingPage, page: () => const AutomaticBlockingPage(), ), - GetPage( + GetPage( name: Routers.normallyOpenModePage, page: () => const NormallyOpenModePage(), ), - GetPage( + GetPage( name: Routers.lockSoundSetPage, page: () => const LockSoundSetPage(), ), - GetPage( + GetPage( name: Routers.burglarAlarmPage, page: () => const BurglarAlarmPage(), ), - GetPage( + GetPage( name: Routers.resetButtonPage, page: () => const ResetButtonPage(), ), - GetPage( + GetPage( name: Routers.unlockQRCodePage, page: () => const UnlockQRCodePage(), ), - GetPage( + GetPage( name: Routers.lockTimePage, page: () => const LockTimePage(), ), // 诊断 - GetPage( + GetPage( name: Routers.diagnosePage, page: () => const DiagnosePage(), ), - GetPage( + GetPage( name: Routers.uploadDataPage, page: () => const UploadDataPage(), ), - GetPage( + GetPage( name: Routers.importOtherLockDataPage, page: () => const ImportOtherLockDataPage(), ), - GetPage( + GetPage( name: Routers.lockEscalationPage, page: () => const LockEscalationPage(), ), - GetPage( + GetPage( name: Routers.markedHouseStatePage, page: () => const MarkedHouseStatePage(), ), - GetPage( + GetPage( name: Routers.checkingInListPage, page: () => const CheckingInListPage(), ), - GetPage( + GetPage( name: Routers.checkingInSetPage, page: () => const CheckingInSetPage(), ), - GetPage( + GetPage( name: Routers.checkingInStaffManagePage, page: () => const CheckingInStaffListPage(), ), - GetPage( + GetPage( name: Routers.checkingInAddStaffPage, page: () => const CheckingInAddStaffPage(), ), - GetPage( + GetPage( name: Routers.checkingInSetWorkTimePage, page: () => const CheckingInSetWorkTimePage(), ), - GetPage( + GetPage( name: Routers.checkingInSetWorkdaySet, page: () => const CheckingInSetWorkdaySet(), ), - GetPage( + GetPage( name: Routers.checkingInSetHolidaysPage, page: () => const CheckingInSetHolidaysPage(), ), - GetPage( + GetPage( name: Routers.checkingInAddHolidaysPage, page: () => const CheckingInAddHolidaysPage(), ), - GetPage( + GetPage( name: Routers.checkingInDeletHolidaysPage, page: () => const CheckingInDeletHolidaysPage(), ), - GetPage( + GetPage( name: Routers.checkingInDetailPage, page: () => const CheckingInDetailPage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoPage, page: () => MinePersonInfoPage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoEditNamePage, page: () => const MinePersonInfoEditNamePage(), ), - GetPage( + GetPage( name: Routers.mineUnbindPhoneOrEmailPage, page: () => const MineUnbindPhoneOrEmailPage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoEditIphonePage, page: () => const MinePersonInfoEditIphonePage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoResetPasswordPage, page: () => const MinePersonInfoResetPasswordPage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoSetSafetyProblemPage, page: () => const MinePersonInfoSetSafetyProblemPage(), ), - GetPage( + GetPage( name: Routers.minePersonInfoEditAccountNextPage, page: () => const MinePersonInfoEditAccountNextPage(), ), - GetPage( + GetPage( name: Routers.gatewayListPage, page: () => const GatewayListPage(), ), - GetPage( + GetPage( name: Routers.messageListPage, page: () => MessageListPage(), ), - GetPage( + GetPage( name: Routers.supportStaffPage, page: () => const SupportStaffPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesPage, page: () => const ValueAddedServicesListPage(), ), - GetPage( + GetPage( name: Routers.aboutPage, page: () => const AboutPage(), ), - GetPage( + GetPage( name: Routers.gatewayDetailPage, page: () => const GatewayDetailPage(), ), - GetPage( + GetPage( name: Routers.gatewayConnectionLockPage, page: () => const GatewayConnectionLockListPage(), ), - GetPage( + GetPage( name: Routers.selectGatewayTypePage, page: () => const SelectGatewayTypePage(), ), - GetPage( + GetPage( name: Routers.selectGatewayTypeNextTipPage, page: () => const SelectGatewayTypeNextTipPage(), ), - GetPage( + GetPage( name: Routers.selectGatewayPage, page: () => const SelectGatewayListPage(), ), - GetPage( + GetPage( name: Routers.gatewayConfigurationWifiPage, page: () => const GatewayConfigurationWifiPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesNoteAndEmailDetailPage, page: () => const ValueAddedServicesNoteAndEmailDetailPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesRealNamePage, page: () => const ValueAddedServicesRealNamePage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesRecordPage, - page: () => ValueAddedServicesRecordPage(), + page: () => const ValueAddedServicesRecordPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesBuyPage, page: () => const ValueAddedServicesBuyPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesHighFunctionPage, page: () => const ValueAddedServicesHighFunctionPage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesListSMSTemplatePage, page: () => const ValueAddedServicesListSMSTemplatePage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesAddSMSTemplatePage, page: () => const ValueAddedServicesAddSMSTemplatePage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesListEmailTemplatePage, page: () => const ValueAddedServicesListEmailTemplatePage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesAddEmailTemplatePage, page: () => const ValueAddedServicesAddEmailTemplatePage(), ), - GetPage( + GetPage( name: Routers.valueAddedServicesBuyAndUseRecordManagePage, page: () => const ValueAddedServicesBuyAndUseRecordManagePage(), ), - GetPage( + GetPage( name: Routers.lockScreenPage, page: () => const LockScreenPage(), ), - GetPage( + GetPage( name: Routers.aPPUnlockNeedMobileNetworkingLockPage, page: () => const APPUnlockNeedMobileNetworkingLockPage(), ), - GetPage( + GetPage( name: Routers.hideInvalidUnlockPermissionsPage, page: () => const HideInvalidUnlockPermissionsPage(), ), - GetPage( + GetPage( name: Routers.authorizedAdministratorListPage, page: () => const AuthorizedAdministratorListPage()), - GetPage( + GetPage( name: Routers.lockUserManageLisPage, page: () => const LockUserManageListPage()), - GetPage( + GetPage( name: Routers.lockGroupListPage, page: () => const LockGroupListPage()), - GetPage( + GetPage( name: Routers.groupEditLockPage, page: () => const GroupEditLockPage()), - GetPage( + GetPage( name: Routers.lockItemListPage, page: () => const LockItemListPage()), - GetPage( + GetPage( name: Routers.transferSmartLockPage, page: () => const TransferSmartLockPage()), - GetPage( + GetPage( name: Routers.recipientInformationPage, page: () => const RecipientInformationPage()), - GetPage( + GetPage( name: Routers.selectBranchPage, page: () => const SelectBranchPage()), - GetPage( + GetPage( name: Routers.selectGetewayListPage, page: () => const SelectGetewayListPage()), - GetPage( + GetPage( name: Routers.mineBindPhoneOrEmailPage, page: () => const MineBindPhoneOrEmailPage()), - GetPage( + GetPage( name: Routers.addAuthorizedAdministratorPage, page: () => const AddAuthorizedAdministratorManagePage()), - GetPage( + GetPage( name: Routers.safetyVerificationPage, page: () => const SafetyVerificationPage(), binding: SafetyVerificationBinding(), ), - GetPage( + GetPage( name: Routers.ownedKeyListPage, page: () => const OwnedKeyListPage()), - GetPage( + GetPage( name: Routers.getDeviceListPage, page: () => const GetDeviceListPage()), - GetPage(name: Routers.getNameListPage, page: () => const GetNameListPage()), - GetPage( + GetPage(name: Routers.getNameListPage, page: () => const GetNameListPage()), + GetPage( name: Routers.authorityManagementPage, page: () => const AuthorityManagementPage()), - GetPage( + GetPage( name: Routers.addFingerprintTipPage, page: () => const AddFingerprintTipPage()), - GetPage( + GetPage( name: Routers.addFingerprintPage, page: () => const AddFingerprintPage()), - GetPage( + GetPage( name: Routers.configuringWifiPage, page: () => const ConfiguringWifiPage()), - GetPage( + GetPage( name: Routers.massSendLockGroupListPage, page: () => const MassSendLockGroupListPage()), - GetPage( + GetPage( name: Routers.massSendReceiverPage, page: () => const MassSendReceiverPage()), - GetPage( + GetPage( name: Routers.lockUserListPage, page: () => const LockUserListPage()), - GetPage( + GetPage( name: Routers.checkInCreatCompanyPage, page: () => const CheckInCreatCompanyPage()), - GetPage( + GetPage( name: Routers.checkingInStaffDetailPage, page: () => const CheckingInStaffDetailPage()), - GetPage( + GetPage( name: Routers.administratorDetailsPage, page: () => const AdministratorDetailsPage()), - GetPage( + GetPage( name: Routers.expireLockManagePage, page: () => const ExpireLockManagePage()), - GetPage( + GetPage( name: Routers.otherTypeKeyChangeDatePage, page: () => const OtherTypeKeyChangeDatePage()), - GetPage( + GetPage( name: Routers.otherTypeKeyChangeValidityDatePage, page: () => const OtherTypeKeyChangeValidityDatePage()), - GetPage(name: Routers.addICCardPage, page: () => const AddICCardPage()), - GetPage( + GetPage(name: Routers.addICCardPage, page: () => const AddICCardPage()), + GetPage( name: Routers.adminDetailChangeDatePage, page: () => const AdminDetailChangeDatePage()), - GetPage( + GetPage( name: Routers.lockAddressGaoDePage, page: () => const LockAddressGaoDePage()), - GetPage(name: Routers.safeVerifyPage, page: () => const SafeVerifyPage()), - GetPage( + GetPage(name: Routers.safeVerifyPage, page: () => const SafeVerifyPage()), + GetPage( name: Routers.minePersonInfoViewSafetyProblemPage, page: () => const MinePersonInfoViewSafetyProblemPage()), - GetPage(name: Routers.webviewShowPage, page: () => const WebviewShowPage()), - GetPage( + GetPage(name: Routers.webviewShowPage, page: () => const WebviewShowPage()), + GetPage( name: Routers.demoModeLockSetPage, page: () => const DemoModeLockSetPage()), - GetPage( + GetPage( name: Routers.demoModeLockDetailPage, page: () => const DemoModeLockDetailPage()), - GetPage( + GetPage( name: Routers.addLockSelectCountryPage, page: () => const AddLockSelectCountryPage()), - GetPage(name: Routers.faceUnlockPage, page: () => const FaceUnlockPage()), - GetPage(name: Routers.motorPowerPage, page: () => const MotorPowerPage()), - GetPage( + GetPage(name: Routers.faceUnlockPage, page: () => const FaceUnlockPage()), + GetPage(name: Routers.motorPowerPage, page: () => const MotorPowerPage()), + GetPage( name: Routers.openDoorDirectionPage, page: () => const OpenDoorDirectionPage()), - GetPage( + GetPage( name: Routers.catEyeWorkModePage, page: () => const CatEyeWorkModePage()), - GetPage( + GetPage( name: Routers.msgNotificationPage, page: () => const MsgNotificationPage()), - GetPage(name: Routers.addFacePage, page: () => const AddFacePage()), - GetPage( + GetPage(name: Routers.addFacePage, page: () => const AddFacePage()), + GetPage( name: Routers.nDaysUnopenedPage, page: () => const NDaysUnopenedPage()), - GetPage( + GetPage( name: Routers.notificationModePage, page: () => const NotificationModePage()), - GetPage( + GetPage( name: Routers.openDoorNotifyPage, page: () => const OpenDoorNotifyPage()), - GetPage(name: Routers.addFamilyPage, page: () => const AddFamilyPage()), - GetPage(name: Routers.lockUserPage, page: () => const LockUserPage()), - GetPage(name: Routers.catEyeSetPage, page: () => const CatEyeSetPage()), - GetPage( + GetPage(name: Routers.addFamilyPage, page: () => const AddFamilyPage()), + GetPage(name: Routers.lockUserPage, page: () => const LockUserPage()), + GetPage(name: Routers.catEyeSetPage, page: () => const CatEyeSetPage()), + GetPage( name: Routers.coerceOpenDoorPage, page: () => const CoerceOpenDoorPage()), - GetPage( + GetPage( name: Routers.coerceFingerprintPage, page: () => const CoerceFingerprintPage()), - GetPage( + GetPage( name: Routers.lowBatteryReminderPage, page: () => const LowBatteryReminderPage()), - GetPage( + GetPage( name: Routers.coerceFingerprintListPage, page: () => const CoerceFingerprintListPage()), - GetPage( + GetPage( name: Routers.lockMonitoringPage, page: () => const LockMonitoringPage()), - GetPage( + GetPage( name: Routers.monitoringRealTimeScreenPage, page: () => const MonitoringRealTimeScreenPage()), - GetPage(name: Routers.videoLogPage, page: () => const VideoLogPage()), - GetPage( + GetPage(name: Routers.videoLogPage, page: () => const VideoLogPage()), + GetPage( name: Routers.editVideoLogPage, page: () => const EditVideoLogPage()), - GetPage( + GetPage( name: Routers.videoLogDetailPage, page: () => const VideoLogDetailPage()), - GetPage( + GetPage( name: Routers.videoLogDownLoadPage, page: () => const VideoLogDownLoadPage()), - GetPage( + GetPage( name: Routers.remoteControlListPage, page: () => const RemoteControlListPage()), - GetPage( + GetPage( name: Routers.addRemoteControlPage, page: () => const AddRemoteControlPage()), - GetPage(name: Routers.cardListPage, page: () => const CardListPage()), - // GetPage( + GetPage(name: Routers.cardListPage, page: () => const CardListPage()), + // GetPage( // name: Routers.addCardTypeManagePage, // page: () => const AddCardTypeManagePage()), - GetPage(name: Routers.addCardPage, page: () => const AddCardPage()), - GetPage(name: Routers.cardDetailPage, page: () => const CardDetailPage()), - GetPage( + GetPage(name: Routers.addCardPage, page: () => const AddCardPage()), + GetPage(name: Routers.cardDetailPage, page: () => const CardDetailPage()), + GetPage( name: Routers.fingerprintListPage, page: () => const FingerprintListPage()), - GetPage( + GetPage( name: Routers.addFingerprintTypePage, page: () => const AddFingerprintTypePage()), - GetPage( + GetPage( name: Routers.fingerprintDetailPage, page: () => const FingerprintDetailPage()), - GetPage(name: Routers.faceListPage, page: () => const FaceListPage()), - GetPage(name: Routers.addFaceTypePage, page: () => const AddFaceTypePage()), - GetPage( + GetPage(name: Routers.faceListPage, page: () => const FaceListPage()), + GetPage(name: Routers.addFaceTypePage, page: () => const AddFaceTypePage()), + GetPage( name: Routers.passwordKeyDetailChangeDatePage, page: () => const PasswordKeyDetailChangeDatePage()), - GetPage( + GetPage( name: Routers.realTimePicturePage, page: () => const RealTimePicturePage()), - GetPage(name: Routers.doorLockLogPage, page: () => const DoorLockLogPage()), - GetPage( + GetPage(name: Routers.doorLockLogPage, page: () => const DoorLockLogPage()), + GetPage( name: Routers.catEyeCustomModePage, page: () => const CatEyeCustomModePage()), - GetPage(name: Routers.videoSlotPage, page: (() => const VideoSlotPage())), - GetPage(name: Routers.liveVideoPage, page: (() => const LiveVideoPage())), - GetPage(name: Routers.faceDetailPage, page: (() => const FaceDetailPage())), - GetPage( + GetPage(name: Routers.videoSlotPage, page: () => const VideoSlotPage()), + GetPage(name: Routers.liveVideoPage, page: () => const LiveVideoPage()), + GetPage(name: Routers.faceDetailPage, page: () => const FaceDetailPage()), + GetPage( name: Routers.messageDetailPage, - page: (() => const MessageDetailPage())), - GetPage( + page: () => const MessageDetailPage()), + GetPage( name: Routers.accessoriesListPage, - page: (() => const AccessoriesListPage())), - GetPage(name: Routers.wifiListPage, page: (() => const WifiListPage())), - GetPage( + page: () => const AccessoriesListPage()), + GetPage(name: Routers.wifiListPage, page: () => const WifiListPage()), + GetPage( name: Routers.seletKeyCyclicDatePage, - page: (() => const SeletKeyCyclicDatePage())), - GetPage(name: Routers.irisListPage, page: (() => const IrisListPage())), - GetPage( + page: () => const SeletKeyCyclicDatePage()), + GetPage(name: Routers.irisListPage, page: () => const IrisListPage()), + GetPage( name: Routers.addIrisTypeManagePage, - page: (() => const AddIrisTypeManagePage())), - GetPage(name: Routers.addIrisPage, page: (() => const AddIrisPage())), - GetPage(name: Routers.palmListPage, page: (() => const PalmListPage())), - GetPage( + page: () => const AddIrisTypeManagePage()), + GetPage(name: Routers.addIrisPage, page: () => const AddIrisPage()), + GetPage(name: Routers.palmListPage, page: () => const PalmListPage()), + GetPage( name: Routers.addPalmTypeManagePage, - page: (() => const AddPalmTypeManagePage())), - GetPage(name: Routers.addPalmPage, page: (() => const AddPalmPage())), - GetPage( + page: () => const AddPalmTypeManagePage()), + GetPage(name: Routers.addPalmPage, page: () => const AddPalmPage()), + GetPage( name: Routers.advancedFeaturesWebPage, - page: (() => const AdvancedFeaturesWebPage())), - GetPage( + page: () => const AdvancedFeaturesWebPage()), + GetPage( name: Routers.advancedFunctionRecordPage, - page: (() => const AdvancedFunctionRecordPage())), - GetPage( + page: () => const AdvancedFunctionRecordPage()), + GetPage( name: Routers.administratorAssociationLockPage, page: () => const AdministratorAssociationLockPage()), ]; diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart index 65855ad9..136a3a7c 100755 --- a/lib/login/login/starLock_login_page.dart +++ b/lib/login/login/starLock_login_page.dart @@ -239,9 +239,7 @@ class _StarLockLoginPageState extends State { child: SizedBox( width: 10.sp, )), - F.isLite - ? Container() - : GestureDetector( + if (F.isLite) Container() else GestureDetector( child: SizedBox( // width: 150.w, height: 50.h, diff --git a/lib/login/login/starLock_login_xhj_page.dart b/lib/login/login/starLock_login_xhj_page.dart index 9b30a3a1..22c16a8d 100755 --- a/lib/login/login/starLock_login_xhj_page.dart +++ b/lib/login/login/starLock_login_xhj_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/login/login/starLock_login_state.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -22,10 +23,8 @@ class StarLockLoginXHJPage extends StatefulWidget { } class _StarLockLoginPageState extends State { - final logic = Get.put(StarLockLoginLogic()); - final state = Get - .find() - .state; + final StarLockLoginLogic logic = Get.put(StarLockLoginLogic()); + final StarLockLoginState state = Get.find().state; @override Widget build(BuildContext context) { @@ -33,269 +32,291 @@ class _StarLockLoginPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFFFFFFF), body: ListView( - padding: EdgeInsets.only(top: 120.h, left: 40.w, right: 40.w), - children: [ - Text( - '${"欢迎使用".tr}${F.title}', - style: TextStyle( - color: AppColors.darkGrayTextColor, - fontSize: 48.sp, + padding: EdgeInsets.only( + top: 120.h, + ), + children: [ + Padding( + padding: EdgeInsets.symmetric(horizontal: 40.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '${"欢迎使用".tr}${F.title}', + style: TextStyle( + color: AppColors.darkGrayTextColor, + fontSize: 48.sp, + ), + ), + SizedBox(height: 30.h), + GestureDetector( + onTap: () async { + final result = + await Get.toNamed(Routers.selectCountryRegionPage); + if (result != null) { + result as Map; + state.countryCode.value = result['code']; + state.countryName.value = result['countryName']; + } + }, + child: Container( + color: Colors.transparent, + child: Row( + children: [ + SizedBox( + width: 5.w, + ), + Text( + TranslationLoader.lanKeys!.countryAndRegion!.tr, + style: TextStyle( + fontSize: 22.sp, + color: AppColors.darkGrayTextColor), + ), + SizedBox( + width: 40.w, + ), + Obx(() { + return Text( + '${state.countryName.value} +${state.countryCode.value}', + style: TextStyle( + fontSize: 22.sp, color: AppColors.mainColor), + ); + }) + ], + ), + ), + ), + LoginInput( + controller: state.emailOrPhoneController, + onchangeAction: (v) { + logic.checkNext(state.emailOrPhoneController); + }, + leftWidget: Padding( + padding: EdgeInsets.only( + top: 30.w, + bottom: 20.w, + ), + ), + rightSlot: IconButton( + icon: const Icon(Icons.close), + onPressed: () {}, + ), + label: TranslationLoader + .lanKeys!.pleaseEnterNumberOrEmail!.tr, + // keyboardType: TextInputType.number, + inputFormatters: [ + LengthLimitingTextInputFormatter(30), + ]), + LoginInput( + controller: state.pwdController, + onchangeAction: (v) { + logic.checkNext(state.pwdController); + }, + isPwd: true, + // isSuffixIcon: 2, + leftWidget: Padding( + padding: EdgeInsets.only( + top: 30.w, + bottom: 20.w, + ), + ), + label: + '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + inputFormatters: [ + LengthLimitingTextInputFormatter(20), + ]), + SizedBox(height: 10.h), + ], ), ), - SizedBox(height: 30.h), - GestureDetector( - onTap: () async { - var result = await Get.toNamed(Routers.selectCountryRegionPage); - if (result != null) { - result as Map; - state.countryCode.value = result['code']; - state.countryName.value = result['countryName']; - } - }, - child: Container( - color: Colors.transparent, - child: Row( - children: [ - SizedBox( - width: 5.w, - ), - Text( - TranslationLoader.lanKeys!.countryAndRegion!.tr, - style: TextStyle( - fontSize: 22.sp, color: AppColors.darkGrayTextColor), - ), - SizedBox( - width: 40.w, - ), - Obx(() { - return Text( - '${state.countryName.value} +${state.countryCode - .value}', - style: TextStyle( - fontSize: 22.sp, color: AppColors.mainColor), - ); - }) - ], - ), - ), - ), - LoginInput( - controller: state.emailOrPhoneController, - onchangeAction: (v) { - logic.checkNext(state.emailOrPhoneController); - }, - leftWidget: Padding( - padding: EdgeInsets.only( - top: 30.w, - bottom: 20.w, - ), - ), - rightSlot: IconButton( - icon: Icon(Icons.close), - onPressed: () {}, - ), - label: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, - // keyboardType: TextInputType.number, - inputFormatters: [ - LengthLimitingTextInputFormatter(30), - ]), - LoginInput( - controller: state.pwdController, - onchangeAction: (v) { - logic.checkNext(state.pwdController); - }, - isPwd: true, - // isSuffixIcon: 2, - leftWidget: Padding( - padding: EdgeInsets.only( - top: 30.w, - bottom: 20.w, - ), - ), - label: - "${TranslationLoader.lanKeys!.pleaseEnter! - .tr}${TranslationLoader.lanKeys!.password!.tr}", - inputFormatters: [ - LengthLimitingTextInputFormatter(20), - ]), - SizedBox(height: 30.h), GestureDetector( onTap: () { state.agree.value = !state.agree.value; logic.changeAgreeState(); }, - child: Padding( - padding: EdgeInsets.symmetric(vertical: 10.h), + child: Container( + color: Colors.transparent, + padding: EdgeInsets.symmetric(vertical: 30.h, horizontal: 40.w), child: Row( mainAxisAlignment: MainAxisAlignment.start, - children: [ + children: [ Obx( - () => - Container( - padding: EdgeInsets.only( - left: 5.w, - right: 10.w, - ), - child: Image.asset( - state.agree.value - ? 'images/icon_round_select.png' - : 'images/icon_round_unSelect.png', - width: 20.w, - height: 20.w, - ), - ), + () => Container( + padding: EdgeInsets.only( + left: 5.w, + right: 10.w, + ), + child: Image.asset( + state.agree.value + ? 'images/icon_round_select.png' + : 'images/icon_round_unSelect.png', + width: 20.w, + height: 20.w, + ), + ), ), Flexible( child: RichText( text: TextSpan( - text: TranslationLoader.lanKeys!.readAndAgree!.tr, - style: TextStyle( - color: const Color(0xff333333), - fontSize: 20.sp), - children: [ - WidgetSpan( - alignment: PlaceholderAlignment.middle, - child: GestureDetector( - child: Text( - '《${TranslationLoader.lanKeys! - .userAgreement!.tr}》', - style: TextStyle( - color: AppColors.mainColor, - fontSize: 20.sp)), - onTap: () { - Get.toNamed(Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro - .userAgreementURL, - "title": '用户协议'.tr - }); - }, - )), - WidgetSpan( - alignment: PlaceholderAlignment.middle, - child: GestureDetector( - child: Text( - '《${TranslationLoader.lanKeys! - .privacyPolicy!.tr}》', - style: TextStyle( - color: AppColors.mainColor, - fontSize: 20.sp)), - onTap: () { - Get.toNamed(Routers.webviewShowPage, - arguments: { - "url": XSConstantMacro - .privacyPolicyURL, - "title": '隐私政策'.tr - }); - }, - )), - ], - )), + text: TranslationLoader.lanKeys!.readAndAgree!.tr, + style: TextStyle( + color: const Color(0xff333333), fontSize: 20.sp), + children: [ + WidgetSpan( + alignment: PlaceholderAlignment.middle, + child: GestureDetector( + child: Text( + '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + style: TextStyle( + color: AppColors.mainColor, + fontSize: 20.sp)), + onTap: () { + Get.toNamed(Routers.webviewShowPage, + arguments: { + 'url': XSConstantMacro.userAgreementURL, + 'title': '用户协议'.tr + }); + }, + )), + WidgetSpan( + alignment: PlaceholderAlignment.middle, + child: GestureDetector( + child: Text( + '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + style: TextStyle( + color: AppColors.mainColor, + fontSize: 20.sp)), + onTap: () { + Get.toNamed(Routers.webviewShowPage, + arguments: { + 'url': XSConstantMacro.privacyPolicyURL, + 'title': '隐私政策'.tr + }); + }, + )), + ], + )), ) ], ), ), ), - SizedBox(height: 15.w), - Obx(() => - SubmitBtn( - btnName: TranslationLoader.lanKeys!.login!.tr, - fontSize: 28.sp, - borderRadius: 20.w, - padding: EdgeInsets.only(top: 25.w, bottom: 25.w), - isDisabled: state.canNext.value, - onClick: state.canNext.value - ? () { - if (state.agree.value == false) { - logic.showToast('请先同意用户协议及隐私政策'.tr); - return; - } else { - logic.login(); - } - } - : null)), - SizedBox(height: 10.h), - ElevatedButton( - onPressed: () async { - var data = await Get.toNamed(Routers.starLockRegisterPage); - if (data != null) { - state.emailOrPhoneController.text = data['phoneOrEmailStr']; - logic.checkNext(state.emailOrPhoneController); - state.pwdController.text = data['pwd']; - logic.checkNext(state.pwdController); - setState(() {}); - } - }, - style: ElevatedButton.styleFrom( - backgroundColor: AppColors.mainColor), - child: Text( - TranslationLoader.lanKeys!.register!.tr, - style: TextStyle(fontSize: 22.sp, color: Colors.white), - ), - ), - SizedBox(height: 5.w), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - GestureDetector( - child: SizedBox( - // width: 150.w, - height: 50.h, - // color: Colors.red, - child: Center( + Padding( + padding: EdgeInsets.symmetric(horizontal: 40.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 5.w), + Obx(() => SubmitBtn( + btnName: TranslationLoader.lanKeys!.login!.tr, + fontSize: 28.sp, + borderRadius: 20.w, + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + isDisabled: state.canNext.value, + onClick: state.canNext.value + ? () { + if (state.agree.value == false) { + logic.showToast('请先同意用户协议及隐私政策'.tr); + return; + } else { + logic.login(); + } + } + : null)), + SizedBox(height: 10.h), + SizedBox( + width: Get.width, + child: ElevatedButton( + onPressed: () async { + final dynamic data = + await Get.toNamed(Routers.starLockRegisterPage); + if (data != null) { + state.emailOrPhoneController.text = + data['phoneOrEmailStr']; + logic.checkNext(state.emailOrPhoneController); + state.pwdController.text = data['pwd']; + logic.checkNext(state.pwdController); + setState(() {}); + } + }, + style: ElevatedButton.styleFrom( + backgroundColor: AppColors.mainColor), child: Text( - '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', - style: TextStyle( - fontSize: 22.sp, color: AppColors.mainColor)), + TranslationLoader.lanKeys!.register!.tr, + style: TextStyle(fontSize: 22.sp, color: Colors.white), + ), ), ), - onTap: () { - Navigator.pushNamed( - context, Routers.starLockForgetPasswordPage); - }, - ), - Expanded( - child: SizedBox( - width: 10.sp, - )), - F.isLite - ? Container() - : GestureDetector( - child: SizedBox( - // width: 150.w, - height: 50.h, - // color: Colors.red, - child: Center( - child: Text('演示模式'.tr, - style: TextStyle( - fontSize: 22.sp, - color: AppColors.mainColor)), - ), + SizedBox(height: 5.w), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + GestureDetector( + child: SizedBox( + // width: 150.w, + height: 50.h, + // color: Colors.red, + child: Center( + child: Text( + '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + style: TextStyle( + fontSize: 22.sp, + color: AppColors.mainColor)), + ), + ), + onTap: () { + Navigator.pushNamed( + context, Routers.starLockForgetPasswordPage); + }, + ), + Expanded( + child: SizedBox( + width: 10.sp, + )), + if (F.isLite) + Container() + else + GestureDetector( + child: SizedBox( + // width: 150.w, + height: 50.h, + // color: Colors.red, + child: Center( + child: Text('演示模式'.tr, + style: TextStyle( + fontSize: 22.sp, + color: AppColors.mainColor)), + ), + ), + onTap: () { + Get.toNamed(Routers.demoModeLockDetailPage); + }, + ) + ], ), - onTap: () { - Get.toNamed(Routers.demoModeLockDetailPage); - }, - ) - ], - ), + ], + ), + ) ], )); } - Widget loginInput({TextEditingController? controller, - List? inputFormatters, - String? hintText, - bool? isHaveLeftWidget, - Widget? leftWidget, - String? label, - bool? isPwd, - BlockStrCallback? onchangeAction}) { + Widget loginInput( + {TextEditingController? controller, + List? inputFormatters, + String? hintText, + bool? isHaveLeftWidget, + Widget? leftWidget, + String? label, + bool? isPwd, + BlockStrCallback? onchangeAction}) { return Container( width: 1.sp, + color: Colors.transparent, child: Column( - children: [ + children: [ Row( - children: [ + children: [ Container( color: Colors.red, child: Image.asset( diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index 19df6d3b..bae84a18 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -295,32 +295,6 @@ class LockDetailLogic extends BaseGetXController { resetOpenDoorState(); } }); - - // BlueManage() - // .blueStart((BluetoothConnectionState deviceConnectionState) async { - // if (deviceConnectionState == BluetoothConnectionState.connected) { - // BlueManage().writeDirectlyBLE( - // 'DC:8F:92:83:69:ED', - // OpenLockCommand( - // lockID: BlueManage().connectDeviceName, - // userID: await Storage.getUid(), - // openMode: state.openDoorModel, - // openTime: getUTCNetTime(), - // onlineToken: state.lockNetToken, - // token: getTokenList, - // needAuthor: 1, - // signKey: signKeyDataList, - // privateKey: getPrivateKeyList, - // ).packageData()); - // } else if (deviceConnectionState == - // BluetoothConnectionState.disconnected) { - // cancelBlueConnetctToastTimer(); - // if (state.ifCurrentScreen.value == true) { - // showBlueConnetctToast(); - // } - // resetOpenDoorState(); - // } - // }); } //蓝牙关闭 @@ -530,8 +504,8 @@ class LockDetailLogic extends BaseGetXController { void resetOpenDoorState() { state.openLockBtnState.value = 0; state.openDoorBtnisUneable.value = false; - state.animationController!.reset(); - state.animationController!.forward(); + state.animationController?.reset(); + state.animationController?.forward(); eventBus.fire(RefreshLockDetailInfoDataEvent()); } diff --git a/lib/main/lockMian/lockList/lockList_xhj_page.dart b/lib/main/lockMian/lockList/lockList_xhj_page.dart index 54f439e8..2c9188e5 100755 --- a/lib/main/lockMian/lockList/lockList_xhj_page.dart +++ b/lib/main/lockMian/lockList/lockList_xhj_page.dart @@ -14,7 +14,6 @@ import 'lockListGroup_view.dart'; import 'lockList_logic.dart'; class LockListXHJPage extends StatefulWidget { - const LockListXHJPage({required this.lockListInfoGroupEntity, Key? key}) : super(key: key); final LockListInfoGroupEntity lockListInfoGroupEntity; @@ -120,9 +119,9 @@ class _LockListXHJPageState extends State with RouteAware { isLast = true; } list.add(Slidable( - key: ValueKey(keyInfo.keyId), + key: ValueKey(keyInfo.keyId), endActionPane: ActionPane( - extentRatio: 0.2, + extentRatio: 0.5, motion: const ScrollMotion(), children: [ SlidableAction( @@ -133,6 +132,7 @@ class _LockListXHJPageState extends State with RouteAware { backgroundColor: Colors.red, foregroundColor: Colors.white, label: '删除'.tr, + borderRadius: BorderRadius.all(Radius.circular(20.w)), padding: EdgeInsets.only(left: 5.w, right: 5.w), ), ], diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart index 4cf3cd43..c616b2f9 100755 --- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart +++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart @@ -12,6 +12,7 @@ import 'package:star_lock/mine/mall/lockMall_page.dart'; import 'package:star_lock/mine/message/messageList/messageList_page.dart'; import 'package:star_lock/mine/message/messageList/messageList_xhj_page.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart'; +import 'package:star_lock/mine/mineSet/mineSet/mineSet_page.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/submitBtn.dart'; import 'package:star_lock/translations/trans_lib.dart'; @@ -76,7 +77,7 @@ class _StarLockMainXHJPageState extends State pageView( widget: SafeArea( bottom: false, - child: MinePersonInfoPage( + child: MineSetPage( showAppBar: false, showAbout: true, ), diff --git a/lib/mine/message/messageList/messageList_xhj_page.dart b/lib/mine/message/messageList/messageList_xhj_page.dart index abde4798..3ac5fe73 100755 --- a/lib/mine/message/messageList/messageList_xhj_page.dart +++ b/lib/mine/message/messageList/messageList_xhj_page.dart @@ -100,7 +100,7 @@ class _MessageListXHJPageState extends State mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - '智能分析', + '智能分析'.tr, style: TextStyle( color: AppColors.blackColor, fontSize: 28.sp, @@ -108,7 +108,7 @@ class _MessageListXHJPageState extends State ), ), Text( - '精准识别设备事件，过滤无效信息', + '精准识别设备事件，过滤无效信息'.tr, style: TextStyle( color: AppColors.blackColor.withOpacity(0.6), fontSize: 20.sp, diff --git a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart index 29716145..d1f59d01 100755 --- a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart @@ -4,7 +4,9 @@ import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart'; +import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_state.dart'; import 'package:star_lock/tools/custom_bottom_sheet.dart'; import '../../../appRouters.dart'; @@ -14,9 +16,8 @@ import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; class MinePersonInfoPage extends StatefulWidget { - MinePersonInfoPage({Key? key, this.showAppBar = true, this.showAbout = false}) + MinePersonInfoPage({Key? key, this.showAbout = false}) : super(key: key); - bool showAppBar; bool showAbout; @override @@ -24,8 +25,8 @@ class MinePersonInfoPage extends StatefulWidget { } class _MinePersonInfoPageState extends State { - final logic = Get.put(MinePersonInfoLogic()); - final state = Get.find().state; + final MinePersonInfoLogic logic = Get.put(MinePersonInfoLogic()); + final MinePersonInfoState state = Get.find().state; @override Widget build(BuildContext context) { @@ -33,60 +34,12 @@ class _MinePersonInfoPageState extends State { backgroundColor: F.sw( skyCall: () => AppColors.mainBackgroundColor, xhjCall: () => AppColors.mainBackgroundColor), - appBar: widget.showAppBar - ? TitleAppBar( + appBar: TitleAppBar( barTitle: TranslationLoader.lanKeys!.personalInformation!.tr, haveBack: true, - backgroundColor: AppColors.mainColor) - : null, + backgroundColor: AppColors.mainColor), body: Column( - children: [ - F.sw( - skyCall: () => SizedBox(), - xhjCall: () => Container( - width: 1.sw, - height: 0.2.sw, - margin: - EdgeInsets.only(top: 15.h, left: 20.w, right: 20.w), - padding: EdgeInsets.symmetric(horizontal: 25.w), - decoration: BoxDecoration( - image: const DecorationImage( - image: AssetImage('images/xhj_main_bg.jpg'), - fit: BoxFit.cover, - ), - borderRadius: BorderRadius.circular(20.r), - boxShadow: [ - BoxShadow( - color: Colors.black.withOpacity(0.15), - offset: const Offset(0, 0), - blurRadius: 10.r, - spreadRadius: 0, - ), - ], - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - '系统设置', - style: TextStyle( - color: AppColors.blackColor, - fontSize: 28.sp, - fontWeight: FontWeight.w600, - ), - ), - Text( - '系统的全局配置在此项内进行设置', - style: TextStyle( - color: AppColors.blackColor.withOpacity(0.6), - fontSize: 20.sp, - fontWeight: FontWeight.w600, - ), - ), - ], - ), - )), + children: [ SizedBox( height: 20.h, ), @@ -95,10 +48,10 @@ class _MinePersonInfoPageState extends State { child: ClipRRect( borderRadius: BorderRadius.circular(20.r), child: Column( - children: [ + children: [ Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.avatar!.tr, - rightTitle: "", + rightTitle: '', allHeight: 100.h, isHaveLine: true, isHaveDirection: true, @@ -119,15 +72,15 @@ class _MinePersonInfoPageState extends State { leftTitel: TranslationLoader.lanKeys!.nickName!.tr, rightTitle: state.mineInfoData.value.nickname != null ? state.mineInfoData.value.nickname! - : "", + : '', isHaveLine: true, isHaveDirection: true, action: () { Navigator.pushNamed( context, Routers.minePersonInfoEditNamePage, - arguments: { + arguments: { 'mineInfoData': state.mineInfoData.value - }).then((value) => logic.getUserInfoRequest()); + }).then((Object? value) => logic.getUserInfoRequest()); })), Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.mobileNumber!.tr, @@ -141,17 +94,17 @@ class _MinePersonInfoPageState extends State { if (state.mineInfoData.value.mobile!.isNotEmpty) { Navigator.pushNamed( context, Routers.mineUnbindPhoneOrEmailPage, - arguments: { + arguments: { 'mobile': state.mineInfoData.value.mobile!, 'isFrom': '1' - }).then((value) => logic.getUserInfoRequest()); + }).then((Object? value) => logic.getUserInfoRequest()); } else { Navigator.pushNamed( context, Routers.mineBindPhoneOrEmailPage, - arguments: { + arguments: { 'mobile': state.mineInfoData.value.mobile!, 'isFrom': '1' - }).then((value) => logic.getUserInfoRequest()); + }).then((Object? value) => logic.getUserInfoRequest()); } })), Obx(() => CommonItem( @@ -166,23 +119,23 @@ class _MinePersonInfoPageState extends State { if (state.mineInfoData.value.email!.isNotEmpty) { Navigator.pushNamed( context, Routers.mineUnbindPhoneOrEmailPage, - arguments: { + arguments: { 'isFrom': '2', 'email': state.mineInfoData.value.email! - }).then((value) => logic.getUserInfoRequest()); + }).then((Object? value) => logic.getUserInfoRequest()); } else { Navigator.pushNamed( context, Routers.mineBindPhoneOrEmailPage, - arguments: { + arguments: { 'isFrom': '2', 'email': state.mineInfoData.value.email! - }).then((value) => logic.getUserInfoRequest()); + }).then((Object? value) => logic.getUserInfoRequest()); } })), CommonItem( leftTitel: TranslationLoader.lanKeys!.resetPasswords!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -192,15 +145,15 @@ class _MinePersonInfoPageState extends State { Obx(() => CommonItem( leftTitel: TranslationLoader.lanKeys!.safetyProblem!.tr, rightTitle: state.mineInfoData.value.haveSafeAnswer == 0 - ? "去设置".tr - : "", + ? '去设置'.tr + : '', isHaveLine: true, isHaveDirection: true, action: () { if (state.mineInfoData.value.haveSafeAnswer == 0) { Navigator.pushNamed(context, Routers.minePersonInfoSetSafetyProblemPage) - .then((value) => logic.getUserInfoRequest()); + .then((Object? value) => logic.getUserInfoRequest()); } else { Navigator.pushNamed(context, Routers.minePersonInfoViewSafetyProblemPage); @@ -211,40 +164,11 @@ class _MinePersonInfoPageState extends State { TranslationLoader.lanKeys!.countryAndRegion!.tr, rightTitle: state.mineInfoData.value.countryName != null ? state.mineInfoData.value.countryName! - : "", + : '', isHaveLine: true, isHaveDirection: false)), - if (F.isLite == false && widget.showAbout) - CommonItem( - leftTitel: - TranslationLoader.lanKeys!.valueAddedServices!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.back(); - Get.toNamed(Routers.valueAddedServicesPage); - }, - ), - if (widget.showAbout) - CommonItem( - leftTitel: TranslationLoader.lanKeys!.set!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.back(); - Get.toNamed(Routers.mineSetPage); - }, - ), - if (widget.showAbout) - CommonItem( - leftTitel: TranslationLoader.lanKeys!.about!.tr, - isHaveLine: false, - isHaveDirection: true, - action: () { - Get.back(); - Get.toNamed(Routers.aboutPage); - }, - ), + + ], ), ), @@ -261,7 +185,7 @@ class _MinePersonInfoPageState extends State { builder: (BuildContext context) { return AlertBottomWidget( topTitle: '', - items: const ['拍照', '从相册选择'], + items: const ['拍照', '从相册选择'], chooseCallback: logic.chooseCallback, ); }); diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index 78bbcf3d..e742ebeb 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -8,6 +8,7 @@ import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/mineSet/mineSet/mineSet_logic.dart'; +import 'package:star_lock/mine/mineSet/mineSet/mineSet_state.dart'; import 'package:star_lock/tools/appFirstEnterHandle.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; @@ -18,15 +19,18 @@ import '../../../tools/titleAppBar.dart'; import '../../../translations/trans_lib.dart'; class MineSetPage extends StatefulWidget { - const MineSetPage({Key? key}) : super(key: key); + MineSetPage({Key? key, this.showAppBar = true, this.showAbout = false}) + : super(key: key); + bool showAppBar; + bool showAbout; @override State createState() => _MineSetPageState(); } class _MineSetPageState extends State with WidgetsBindingObserver { - final logic = Get.put(MineSetLogic()); - final state = Get.find().state; + final MineSetLogic logic = Get.put(MineSetLogic()); + final MineSetState state = Get.find().state; @override void initState() { @@ -53,19 +57,21 @@ class _MineSetPageState extends State with WidgetsBindingObserver { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: F.sw( - skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.moreSet!.tr, - haveBack: true, - backgroundColor: AppColors.mainColor, - ), - xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.moreSet!.tr, - haveBack: true, - backgroundColor: Colors.white, - iconColor: AppColors.blackColor, - titleColor: AppColors.blackColor, - )), + appBar: widget.showAppBar + ? F.sw( + skyCall: () => TitleAppBar( + barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor, + ), + xhjCall: () => TitleAppBar( + barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + haveBack: true, + backgroundColor: Colors.white, + iconColor: AppColors.blackColor, + titleColor: AppColors.blackColor, + )) + : null, body: SingleChildScrollView( child: styleHierarchy(), ), @@ -77,23 +83,72 @@ class _MineSetPageState extends State with WidgetsBindingObserver { Widget view = getListDataView(); view = F.sw( skyCall: () => view, - xhjCall: () => Container( - margin: EdgeInsets.only( - top: 20.h, left: 20.w, right: 20.w, bottom: 40.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(20.r))), - child: ClipRRect( - borderRadius: BorderRadius.circular(20.r), - child: view, - ), + xhjCall: () => Column( + children: [ + Container( + width: 1.sw, + height: 0.2.sw, + margin: EdgeInsets.only( + top: 15.h, left: 20.w, right: 20.w, bottom: 20.h), + padding: EdgeInsets.symmetric(horizontal: 25.w), + decoration: BoxDecoration( + image: const DecorationImage( + image: AssetImage('images/xhj_main_bg.jpg'), + fit: BoxFit.cover, + ), + borderRadius: BorderRadius.circular(20.r), + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(0.15), + offset: const Offset(0, 0), + blurRadius: 10.r, + spreadRadius: 0, + ), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '系统设置'.tr, + style: TextStyle( + color: AppColors.blackColor, + fontSize: 28.sp, + fontWeight: FontWeight.w600, + ), + ), + Text( + '系统的全局配置在此项内进行设置'.tr, + style: TextStyle( + color: AppColors.blackColor.withOpacity(0.6), + fontSize: 20.sp, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + ), + Container( + margin: EdgeInsets.only( + top: 20.h, left: 20.w, right: 20.w, bottom: 40.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(20.r))), + child: ClipRRect( + borderRadius: BorderRadius.circular(20.r), + child: view, + ), + ), + F.sw(skyCall: () => const SizedBox(), xhjCall: keyBottomWidget), + ], )); return view; } Widget getListDataView() { return Column( - children: [ + children: [ /* 2024-01-12 会议确定去掉“提示音、触摸开锁” by DaisyWu CommonItem( leftTitel: TranslationLoader.lanKeys!.prompTone!.tr, @@ -114,29 +169,42 @@ class _MineSetPageState extends State with WidgetsBindingObserver { height: 50.h, child: Obx(() => _isTouchUnlockSwitch()))), */ + F.sw( + skyCall: () => const SizedBox(), + xhjCall: () => CommonItem( + leftTitel: TranslationLoader.lanKeys!.personalInformation!.tr, + rightTitle: '', + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.minePersonInfoPage); + })), CommonItem( leftTitel: TranslationLoader.lanKeys!.pushNotification!.tr, - rightTitle: "", + rightTitle: '', isHaveRightWidget: true, - isHaveLine: F.appFlavor == Flavor.sky ? true : false, + isHaveLine: F.sw( + skyCall: () => F.appFlavor == Flavor.sky, xhjCall: () => true), rightWidget: SizedBox( width: 60.w, height: 50.h, - child: Obx(() => _isPushNotificationSwitch()))), - F.appFlavor == Flavor.sky - ? CommonItem( - leftTitel: "微信公众号推送".tr, - rightTitle: "", - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 60.w, - height: 50.h, - child: Obx(() => _isWechatPublicAccountPushSwitch()))) - : Container(), + child: Obx(_isPushNotificationSwitch))), + if (F.appFlavor == Flavor.sky) + CommonItem( + leftTitel: '微信公众号推送'.tr, + rightTitle: '', + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: SizedBox( + width: 60.w, + height: 50.h, + child: Obx(_isWechatPublicAccountPushSwitch))) + else + Container(), SizedBox(height: 10.h), CommonItem( leftTitel: TranslationLoader.lanKeys!.lockUserManagement!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -144,7 +212,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { }), CommonItem( leftTitel: TranslationLoader.lanKeys!.authorizedAdmin!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -153,7 +221,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { //by DaisyWu 新增--批量授权 CommonItem( leftTitel: TranslationLoader.lanKeys!.authorityManagement!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -162,7 +230,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { }), CommonItem( leftTitel: TranslationLoader.lanKeys!.lockGroup!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -170,7 +238,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { }), CommonItem( leftTitel: TranslationLoader.lanKeys!.transferSmartLock!.tr, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: () { @@ -178,7 +246,8 @@ class _MineSetPageState extends State with WidgetsBindingObserver { }), CommonItem( leftTitel: TranslationLoader.lanKeys!.transferGateway!.tr, - rightTitle: "", + rightTitle: '', + isHaveLine: true, isHaveDirection: true, action: () { Get.toNamed(Routers.selectGetewayListPage); @@ -224,16 +293,17 @@ class _MineSetPageState extends State with WidgetsBindingObserver { isHaveDirection: true, action: () { Navigator.pushNamed( - context, Routers.hideInvalidUnlockPermissionsPage, - arguments: {'isOn': state.hideExpiredAccessFlag.value}) - .then((value) { + context, Routers.hideInvalidUnlockPermissionsPage, + arguments: { + 'isOn': state.hideExpiredAccessFlag.value + }).then((Object? value) { logic.userSettingsInfoRequest(); }); })), CommonItem( leftTitel: TranslationLoader .lanKeys!.appUnlockRequiresMobilePhoneAccessToTheLock!.tr, - rightTitle: "", + rightTitle: '', // allHeight: 100.h, isHaveLine: true, isHaveDirection: true, @@ -245,41 +315,58 @@ class _MineSetPageState extends State with WidgetsBindingObserver { height: 10.h, ), //上架审核注释 - F.isLite - ? Container() - : CommonItem( - leftTitel: "Amazon Alexa", - rightTitle: "", - isHaveLine: true, - isHaveDirection: true, - action: () { - logic.showToast("功能暂未开放".tr); - }), - F.isLite - ? Container() - : CommonItem( - leftTitel: "Google Home", - rightTitle: "", - isHaveLine: true, - isHaveDirection: true, - action: () { - logic.showToast("功能暂未开放".tr); - }), - F.isLite - ? Container() - : CommonItem( - leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr, - rightTitle: "", - isHaveLine: false, - isHaveDirection: true, - action: () { - logic.showToast("功能暂未开放".tr); - }), + if (!F.isLite) + CommonItem( + leftTitel: 'Amazon Alexa', + rightTitle: '', + isHaveLine: true, + isHaveDirection: true, + action: () { + logic.showToast('功能暂未开放'.tr); + }), + if (!F.isLite) + CommonItem( + leftTitel: 'Google Home', + rightTitle: '', + isHaveLine: true, + isHaveDirection: true, + action: () { + logic.showToast('功能暂未开放'.tr); + }), + if (!F.isLite) + CommonItem( + leftTitel: TranslationLoader.lanKeys!.xiaomiIOTPlatform!.tr, + rightTitle: '', + isHaveLine: widget.showAbout, + isHaveDirection: true, + action: () { + logic.showToast('功能暂未开放'.tr); + }), + if (!F.isLite && widget.showAbout) + CommonItem( + leftTitel: TranslationLoader.lanKeys!.valueAddedServices!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.back(); + Get.toNamed(Routers.valueAddedServicesPage); + }, + ), + if (widget.showAbout) + CommonItem( + leftTitel: TranslationLoader.lanKeys!.about!.tr, + isHaveLine: false, + isHaveDirection: true, + action: () { + Get.back(); + Get.toNamed(Routers.aboutPage); + }, + ), // CommonItem(leftTitel:TranslationLoader.lanKeys!.valueAddedServices!.tr, rightTitle:"", isHaveDirection: true, action: (){ // // }), SizedBox( - height: 50.h, + height: F.sw(skyCall: () => 50.h, xhjCall: () => 0.0), ), // CommonItem(leftTitel:TranslationLoader.lanKeys!.about!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ // @@ -300,52 +387,56 @@ class _MineSetPageState extends State with WidgetsBindingObserver { // CommonItem(leftTitel:TranslationLoader.lanKeys!.thirdPartyInformationSharingList!.tr, rightTitle:"", isHaveLine: true, isHaveDirection: true, action: (){ // // }), - keyBottomWidget() + F.sw(skyCall: keyBottomWidget, xhjCall: () => const SizedBox()) ], ); } Widget keyBottomWidget() { - return Column( - children: [ - SubmitBtn( - btnName: TranslationLoader.lanKeys!.logout!.tr, - isDelete: true, - padding: EdgeInsets.symmetric(horizontal: 15.w), - onClick: () { - //退出登录 - ShowTipView().showIosTipWithContentDialog("确定要退出吗？".tr, () { - logic.userLogoutRequest(); - }); - // showLoginOutAlertTipDialog(); - }), - Container( - padding: EdgeInsets.only(right: 30.w, top: 30.h), - // color: Colors.red, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - TextButton( - child: Text( - TranslationLoader.lanKeys!.deleteAccount!.tr, - style: TextStyle( - color: AppColors.darkGrayTextColor, fontSize: 18.sp), + return Padding( + padding: F.sw( + skyCall: () => EdgeInsets.zero, + xhjCall: () => EdgeInsets.symmetric(horizontal: 15.w)), + child: Column( + children: [ + SubmitBtn( + btnName: TranslationLoader.lanKeys!.logout!.tr, + isDelete: true, + padding: EdgeInsets.symmetric(horizontal: 15.w), + onClick: () { + //退出登录 + ShowTipView().showIosTipWithContentDialog( + '确定要退出吗？'.tr, logic.userLogoutRequest); + // showLoginOutAlertTipDialog(); + }), + Container( + padding: EdgeInsets.only(right: 30.w, top: 30.h), + // color: Colors.red, + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + TextButton( + child: Text( + TranslationLoader.lanKeys!.deleteAccount!.tr, + style: TextStyle( + color: AppColors.darkGrayTextColor, fontSize: 18.sp), + ), + onPressed: () { + ShowTipView().showIosTipWithContentDialog( + TranslationLoader.lanKeys!.deleteAccountTips!.tr, () { + //安全验证 + Get.toNamed(Routers.safeVerifyPage); + }); + }, ), - onPressed: () { - ShowTipView().showIosTipWithContentDialog( - TranslationLoader.lanKeys!.deleteAccountTips!.tr, () { - //安全验证 - Get.toNamed(Routers.safeVerifyPage); - }); - }, - ), - ], + ], + ), ), - ), - SizedBox( - height: 30.h, - ) - ], + SizedBox( + height: 30.h, + ) + ], + ), ); } @@ -411,7 +502,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isPrompTone.value, - onChanged: (value) { + onChanged: (bool value) { state.isPrompTone.value = !state.isPrompTone.value; logic.updatePrompToneRequest(); }, @@ -424,7 +515,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isTouchUnlock.value, - onChanged: (value) { + onChanged: (bool value) { state.isTouchUnlock.value = !state.isTouchUnlock.value; logic.updateTouchUnlockRequest(); }, @@ -438,7 +529,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isWechatPublicAccountPush.value, - onChanged: (value) { + onChanged: (bool value) { state.isWechatPublicAccountPush.value = !state.isWechatPublicAccountPush.value; logic.setMpWechatPushSwitchRequest(context); @@ -452,7 +543,7 @@ class _MineSetPageState extends State with WidgetsBindingObserver { trackColor: CupertinoColors.systemGrey5, thumbColor: CupertinoColors.white, value: state.isPushNotification.value, - onChanged: (value) { + onChanged: (bool value) { // state.isPushNotification.value = !state.isPushNotification.value; openAppSettings(); }, diff --git a/lib/network/api_provider_base.dart b/lib/network/api_provider_base.dart index 5698314a..00f2c2ae 100755 --- a/lib/network/api_provider_base.dart +++ b/lib/network/api_provider_base.dart @@ -26,7 +26,7 @@ class BaseProvider extends GetConnect with Api { Future> post( String? url, body, { - String? contentType = "application/json", + String? contentType = 'application/json', Map? headers, Map? query, Decoder? decoder, @@ -35,7 +35,7 @@ class BaseProvider extends GetConnect with Api { bool? isUnShowLoading = false, // 是否显示loading bool? isUserBaseUrl = true, // 文件上传不使用baseUrl }) async { - AppLog.log("post: url:$url body:$body"); + AppLog.log('post: url:$url body:$body'); if (isUnShowLoading == false){ EasyLoading.show(); } @@ -55,14 +55,14 @@ class BaseProvider extends GetConnect with Api { // EasyLoading.showToast("Network Error!", duration: 2000.milliseconds); if (res.statusCode == null) { - EasyLoading.showToast("网络访问失败,请检查网络是否正常".tr, duration: 2000.milliseconds); + EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr, duration: 2000.milliseconds); // EasyLoading.showToast("Network Error!", duration: 2000.milliseconds); } var rs = { - "errorMsg": "Network Error!", - "errorCode": -1, - "data": null, - "description": "表示成功或是。" + 'errorMsg': 'Network Error!', + 'errorCode': -1, + 'data': null, + 'description': '表示成功或是。' }; return Response( request: res.request, @@ -78,24 +78,24 @@ class BaseProvider extends GetConnect with Api { } getDataResult(T) { - switch (T["errorCode"]) { + switch (T['errorCode']) { case 403: Get.offNamedUntil(Routers.starLockLoginPage, (route) => false); break; case 500: - EasyLoading.showToast("服务器错误", duration: 2000.milliseconds); + EasyLoading.showToast('服务器错误', duration: 2000.milliseconds); break; case 421: case 422: case 430: //与葛工约定弹出ErrorMsg - EasyLoading.showToast(T["errorMsg"], duration: 2000.milliseconds); + EasyLoading.showToast(T['errorMsg'], duration: 2000.milliseconds); break; //已单独处理，暂不做全局弹窗 // case 425: // Toast.show(msg: "用户不存在"); // break; case 10001: - EasyLoading.showToast("数据不存在", duration: 2000.milliseconds); + EasyLoading.showToast('数据不存在', duration: 2000.milliseconds); break; } }