diff --git a/lan/lan_en.json b/lan/lan_en.json index 8b0f69a2..3ad3687a 100755 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -171,157 +171,127 @@ "NFC无源锁": "NFC Passive Lock", "添加设备": "Add device", "网关": "Gateway", - "supportStaff": "Support Staff", - "set": "Setting", - "moreServices": "More Services", - "moreSet": "More Set", - "prompTone": "Promp Tone", - "touchUnlock": "Touch Unlock", - "pushNotification": "Push Notification", - "lockUserManagement": "Lock User Management", - "ownedKey": "Owned key", - "authorityManagement": "Authority management", - "associatedDevice": "Associated device", - "associatedName": "Associated name", - "device": "Device", - "aboutToExpire": "About to expire", - "deAuthorize": "de-authorize", - "changeName": "Change name", - "authorizedAdmin": "Admin", - "addAuthorizedAdmin": "Adding an Authorized Administrator", - "lockGroup": "Lock Group", - "transferSmartLock": "Transfer Smart Lock", - "selectiveLock": "Selective lock", - "recipientInformation": "recipientInformation", - "transferGateway": "Transfer Gateway", - "multiLanguage": "Multi Language", - "lockScreen": "Lock Screen", - "closed": "Closed", - "opened": "Opened", - "close": "Close", - "open": "Open", - "hideInvalidUnlockPermissions": "Hide Invalid Unlock Permissions", - "appUnlockRequiresMobilePhoneAccessToTheLock": "APP Unlock Requires Phone Access To Lock", - "valueAddedServices": "Value Added Services", - "about": "About", - "userAgreement": "User Agreement", - "privacyPolicy": "Privacy Policy", - "personalInformationCollectionList": "Personal Information Collection List", - "applicationPermissionDescription": "Application Permission Description", - "thirdPartyInformationSharingList": "Third party information sharing list", - "logout": "Logout", - "deleteAccount": "Delete Account", - "personalInformation": "Personal Information", - "avatar": "Avatar", - "nickName": "NickName", - "changeNickName": "Change NickName", - "modifyAccount": "Modify Account", + "客服": "Customer Service", + "设置": "Setting", + "更多设置": "More Set", + + "消息推送": "Push Notification", + "锁用户管理": "Lock User Management", + "拥有的钥匙": "Owned key", + "批量授权": "Authority management", + "关联设备": "Associated device", + "关联姓名": "Associated name", + "转移智能锁": "Transfer Smart Lock", + "选择锁": "Select Lock", + "接收人信息": "Receiver Information", + "转移网关": "Transfer Gateway", + "锁屏": "Lock Screen", + "已关闭": "Closed", + "已开启": "Opened", + "开启": "Open", + "确定要开启重置键?": "Are you sure you want to open the reset key?", + "确定要关闭重置键?": "Are you sure you want to close the reset key?", + "隐藏无效开锁权限": "Hide invalid unlock permissions", + "APP开锁时需手机连网的锁": "APP Unlock Requires Phone Access To Lock", + "增值服务": "Value Added Services", + "关于": "About", + "退出": "Logout", + "删除账号": "Delete Account", + "个人信息": "Personal Information", + "头像": "Avatar", + "昵称": "NickName", + "请输入昵称": "Please enter your nickname", + "修改昵称": "Change NickName", + "修改账号": "Modify Account", "重置密码": "Reset Passwords", - "safetyProblem": "Safety Problem", - "modifyAccountTip": "For the security of your account, please use the account password verification before modifying the account", - "pleaseEnterAccountNumber": "Please enter your account number", - "pleaseEnterNewAccountNumber": "Please enter your new account number", - "changeIphoneTip": "When you retrieve your password and log in to a new device, you can verify it with the attached phone", - "changeEmailTip": "When you retrieve your password and log in to a new device, you can verify it with the attached Email", - "goBind": "Go Bind", - "originalPassword": "Original Password", - "newPassword": "New Password", + "安全问题": "Safety Problem", + "为了你的账号安全，修改账号前请先使用验证码验证": "For the security of your account, please use the account password verification before modifying the account", + "请输入新账号": "Please enter your new account number", + "找回密码和登录新设备时，可通过绑定的手机验证": "When you retrieve your password and log in to a new device, you can verify it with the attached phone", + "找回密码和登录新设备时，可通过绑定的邮箱验证": "When you retrieve your password and log in to a new device, you can verify it with the attached Email", + "原密码": "Original Password", + "新密码": "New Password", "确认密码": "Sure Password", - "safetyProblemTip": "When you lose your phone, you can log in to the new device by answering the security questions you set", - "problemOne": "Problem One", - "problemTwo": "Problem Two", - "problemThree": "Problem Three", - "pleaseEnterYourAnswer": "Please Enter Your Answer", - "designation": "designation", - "state": "State", - "wifiName": "Wifi Name", - "networkMAC": "Network MAC", - "gatewayUpgrade": "Gateway Upgrade", - "gatewayConnectionLock": "Gateway Connection Lock", - "strongSignal": "Strong Signal", - "mediumSignal": "Medium Signal", - "averageSignal": "Average Signal", - "weakSignal": "Weak Signal", - "selectGatewayType": "Select Gateway Type", - "addGateway": "Add Gateway", - "turnThePowerBackOn": "Turn The Power Back On", - "indicatorLight": "Indicator Light", - "selectGatewayTypeNextTip": "Repower the gateway and click Next when the indicator light flashes alternately", - "selectGateway": "Select Gateway", - "gatewayConfigurationWifiTip": "5G WiFi network is not supported, please choose 2.4G WiFi network for configuration", - "wifiPassward": "WiFi Passward", - "pleaseEnterTheWiFiPassword": "Please Enter The WiFi Password", - "gatewayName": "Gateway Name", - "pleaseEnterGatewayName": "Please Enter Gateway Name", - "wifiMAC": "WiFi MAC", - "ipAddress": "IP Address", - "subnetMask": "Subnet Mask", - "defaultGateway": "Default Gateway", - "automaticallyGetTheDNSServerAddress": "Automatically Get The DNS Server Address", - "preferredDNS": "Preferred DNS", - "alternativeDNS": "Alternative DNS", - "noStaticIPIsUsed": "No Static IP Is Used", - "allLock": "All Lock", - "searchAllLockType": "Search All Lock Type", - "doorLock": "Door Lock", - "padlock": "Pad lock", - "safeLock": "Safe Lock", - "intelligentLockCore": "Intelligent Lock Core", - "itelligentAccessControl": "Intelligent access control", - "parkingLock": "Parking Lock", - "bicycleLock": "Bicycle Lock", - "longRangeControl": "LongRange Control", - "lightTouchScreen": "Light Touch Screen", - "lightTouchScreenTip": "Light Touch Screen Tip", - "next": "Next", - "nearbyLock": "Nearby Lock", - "addSuccessfullyPleaseRename": "If you want to change the name, please rename, click OK to add lock", - "whenAddingLockThePhoneMustBeNextToTheLock": "When adding a lock, the phone must be next to the lock", - "login": "Login", - "register": "Register", - "forgetPassword": "Forget Password", - "readAndAgree": "I Have Read And Agree", - "verificationCode": "VerificationCode", - "registerPasswordTip": "The password must be 8-20 characters, including at least 2 of the numbers/letters/symbols", - "iphone": "Iphone", - "email": "Email", - "mobileNumber": "Mobile phone number", - "countryAndRegion": "Country And Region", - "select": "Select", - "getVerificationCode": "Get Verification Code", - "businessCooperation": "Business Cooperation", - "officialWebsite": "Official Website", - "computerWebVersion": "Computer Web Version", - "hotelSystem": "Hotel System", - "manualWebVersion": "Manual Web Version", - "introduce": "Introduce", - "note": "Note", - "mail": "Mail", - "advancedFunction": "Advanced Function", - "pushMessage": "Push Message", - "recordsRetention": "Records Retention", - "smsBuyTip": "You can send the password and electronic key information to the recipient via SMS.", - "emailBuyTip": "You can send the password and electronic key information to the recipient by email.", - "currentRemainingQuantity": "Current Remaining Quantity", - "buy": "Buy", - "customSMSTemplate": "Custom SMS Template", - "customMailTemplate": "Custom Mail Template", - "record": "Record", - "forTheFirstTime": "For the first time", - "onceDay": "once a day", - "weekOnce": "once a week", - "monthOnce": "once every month", - "currentState": "Current State", - "onTrial": "On Trial", - "haveNotOpened": "Have Not Opened", - "advancedFeaturesAndBenefitsContent": "Advanced Features And Benefits Content", - "smsTemplate": "SMS Template", - "emailTemplate": "Email Template", - "cardIssuingtool": "Card Issuing tool", - "titleForBuyingAdvancedFeatures": "Tips for buying advanced features", - "tipsForBuyingAdvancedFeatures": "More advanced features are under development, and if you need them, you are welcome to open the service based on the number of locks. Advanced features are only available for your own locks. If you are an authorized administrator, please contact the top administrator of the lock to open the service", - "freeTrial": "Free Trial", - "openNow": "Open Now", + "当你手机丢了，可以通过回答设置的安全问题来登录新设备": "When you lose your phone, you can log in to the new device by answering the security questions you set", + "问题一": "Problem One", + "问题二": "Problem Two", + "问题三": "Problem Three", + "请输入你的答案": "Please Enter Your Answer", + "即将到期": "About to expire", + "去授权": "Go to authorize", + "修改名称": "Change name", + "状态": "State", + "WiFi名称": "Wifi Name", + "网络MAC": "Network MAC", + "网关升级": "Gateway Upgrade", + "网关连接的锁": "Gateway Connection Lock", + "信号强": "Strong Signal", + "选择网关类型": "Select Gateway Type", + "添加网关": "Add Gateway", + "重新通电": "Turn The Power Back On", + "指示灯": "Indicator Light", + "将网关重新通电，指示灯交替闪烁时点击下一步": "Repower the gateway and click Next when the indicator light flashes alternately", + "选择网关": "Select Gateway", + "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置": "5G WiFi network is not supported, please choose 2.4G WiFi network for configuration", + "WiFi密码": "WiFi Passward", + "请输入WiFi密码": "Please Enter The WiFi Password", + "网关名称": "Gateway Name", + "请输入网关名称": "Please Enter Gateway Name", + "IP地址": "IP Address", + "子网掩码": "Subnet Mask", + "默认网关": "Default Gateway", + "自动获取DNS服务器地址": "Automatically Get The DNS Server Address", + "首选DNS": "Preferred DNS", + "备选DNS": "Alternative DNS", + "不使用静态IP": "No Static IP Is Used", + "所有锁": "All Lock", + "搜索所有锁类型": "Search All Lock Type", + "门锁": "Door Lock", + "挂锁": "Pad lock", + "保险箱锁": "Safe Lock", + "智能门禁": "Intelligent access control", + "车位锁": "Parking Lock", + "摸亮触摸屏": "Light Touch Screen", + "摸亮触摸屏，锁进入可添加状态，点击下一步": "Touch the screen to light up, the lock enters the addable state, click Next", + "附近的锁": "Nearby Lock", + "如需修改名字请重新命名，点击确定添加锁": "If you want to change the name, please rename, click OK to add lock", + "添加锁时，手机必须在锁旁边": "When adding a lock, the phone must be next to the lock", + "登录": "Login", + "注册": "注册", + "我已阅读并同意": "I Have Read And Agree", + "验证码": "验证码", + "密码必须是8-20位，至少包括数字/字母/符号中的2种": "The password must be 8-20 characters, including at least 2 of the numbers/letters/symbols", + "手机": "Iphone", + "邮箱": "Email", + "请输入邮箱": "请输入邮箱", + "国家/地区": "Country/Region", + "你所在的国家/地区": "The country/region you are in", + "选择国家/地区": "Select Country/Region", + "获取验证码": "Get Code", + "商务合作": "Business Cooperation", + "电脑网页版": "Computer Web Version", + "酒店系统": "Hotel System", + "说明书网页版": "Manual Web Version", + "高级功能": "Advanced Function", + "记录保存": "Records Retention", + "您可通过短信将密码、电子钥匙信息发给接收人。": "You can send the password and electronic key information to the recipient via SMS.", + "您可通过邮件将密码、电子钥匙信息发给接收人。": "You can send the password and electronic key information to the recipient by email.", + "购买实名认证提示": "After the function is enabled, you need to use your fingerprint, face or account password to open the APP. There is no need to verify again for 3 minutes", + "请选择你希望的实名认证频次": "Please select the real-name authentication frequency you want", + "仅首次": "For the first time", + "每日一次": "once a day", + "每周一次": "once a week", + "每月一次": "once every month", + "当前状态": "Current State", + "试用中": "On Trial", + "高级功能权益内容": "Advanced Features And Benefits Content", + "短信模板": "SMS Template", + "邮件模板": "Email Template", + "发卡工具": "Card Issuing tool", + "购买高级功能须知": "Tips for buying advanced features", + "购买高级功能提示": "More advanced features are under development, and if you need them, you are welcome to open the service based on the number of locks. Advanced features are only available for your own locks. If you are an authorized administrator, please contact the top administrator of the lock to open the service", + "免费体验": "Free Trial", + "立即开通": "Open Now", "buySMS": "Buy SMS", "buyMail": "Buy Mail", "buyRealNameAuthenticationTimes": "Purchase Real Name Authentication Times", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index fb32ff86..1c49eec6 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -170,166 +170,133 @@ "NFC无源锁":"NFC无源锁", "添加设备":"添加设备", "网关":"网关", - "supportStaff":"supportStaff", - "set":"set", - "moreServices":"moreServices", + "客服":"客服", + "设置":"设置", + "更多设置":"更多设置", - "moreSet":"moreSet", - "prompTone":"prompTone", - "touchUnlock":"touchUnlock", - "pushNotification":"pushNotification", - "lockUserManagement":"lockUserManagement", - "ownedKey":"ownedKey", - "authorityManagement":"authorityManagement", - "associatedDevice":"associatedDevice", - "associatedName":"associatedName", - "device":"device", - "authorizedAdmin":"authorizedAdmin", - "addAuthorizedAdmin":"addAuthorizedAdmin", - "lockGroup":"lockGroup", - "transferSmartLock":"transferSmartLock", - "selectiveLock":"selectiveLock", - "recipientInformation":"recipientInformation", - "transferGateway":"transferGateway", - "multiLanguage":"multiLanguage", - "lockScreen":"lockScreen", - "closed":"closed", - "opened":"opened", - "close":"close", - "open":"open", - "hideInvalidUnlockPermissions":"hideInvalidUnlockPermissions", - "appUnlockRequiresMobilePhoneAccessToTheLock":"appUnlockRequiresMobilePhoneAccessToTheLock", - "valueAddedServices":"valueAddedServices", - "about":"about", - "userAgreement":"userAgreement", - "privacyPolicy":"privacyPolicy", - "personalInformationCollectionList":"personalInformationCollectionList", - "applicationPermissionDescription":"applicationPermissionDescription", - "thirdPartyInformationSharingList":"thirdPartyInformationSharingList", - "logout":"logout", - "deleteAccount":"deleteAccount", - "personalInformation":"personalInformation", - "avatar":"avatar", - "nickName":"nickName", - "changeNickName":"changeNickName", - "modifyAccount":"modifyAccount", + "消息推送":"消息推送", + "锁用户管理":"锁用户管理", + "拥有的钥匙":"拥有的钥匙", + "批量授权":"批量授权", + "关联设备":"关联设备", + "关联姓名":"关联姓名", + "转移智能锁":"转移智能锁", + "选择锁":"选择锁", + "接收人信息":"接收人信息", + "转移网关":"转移网关", + "锁屏":"锁屏", + "已关闭":"已关闭", + "已开启":"已开启", + "开启":"开启", + "确定要开启重置键?": "确定要开启重置键?", + "确定要关闭重置键?": "确定要关闭重置键?", + "隐藏无效开锁权限":"隐藏无效开锁权限", + "APP开锁时需手机连网的锁":"APP开锁时需手机连网的锁", + "增值服务":"增值服务", + "关于":"关于", + "退出":"退出", + "删除账号":"删除账号", + "个人信息":"个人信息", + "头像":"头像", + "昵称":"昵称", + "请输入昵称": "请输入昵称", + "修改昵称":"修改昵称", + "修改账号":"修改账号", "重置密码":"重置密码", - "safetyProblem":"safetyProblem", - "modifyAccountTip":"modifyAccountTip", - "pleaseEnterAccountNumber":"pleaseEnterAccountNumber", - "pleaseEnterNewAccountNumber":"pleaseEnterNewAccountNumber", - "changeIphoneTip":"changeIphoneTip", - "changeEmailTip":"changeEmailTip", - "goBind":"goBind", - "originalPassword":"originalPassword", - "newPassword":"newPassword", + "安全问题":"安全问题", + "为了你的账号安全，修改账号前请先使用验证码验证":"为了你的账号安全，修改账号前请先使用验证码验证", + "请输入新账号":"请输入新账号", + "找回密码和登录新设备时，可通过绑定的手机验证":"找回密码和登录新设备时，可通过绑定的手机验证", + "找回密码和登录新设备时，可通过绑定的邮箱验证":"找回密码和登录新设备时，可通过绑定的邮箱验证", + "原密码":"原密码", + "新密码":"新密码", "确认密码":"确认密码", - "safetyProblemTip":"safetyProblemTip", - "problemOne":"problemOne", - "problemTwo":"problemTwo", - "problemThree":"problemThree", - "pleaseEnterYourAnswer":"pleaseEnterYourAnswer", - "aboutToExpire":"aboutToExpire", - "deAuthorize":"deAuthorize", - "changeName":"changeName", + "当你手机丢了，可以通过回答设置的安全问题来登录新设备":"当你手机丢了，可以通过回答设置的安全问题来登录新设备", + "问题一":"问题一", + "问题二":"问题二", + "问题三":"问题三", + "请输入你的答案":"请输入你的答案", + "即将到期":"即将到期", + "去授权":"去授权", + "修改名称":"修改名称", - "designation": "designation", - "state": "state", - "wifiName": "wifiName", - "networkMAC": "networkMAC", - "gatewayUpgrade": "gatewayUpgrade", - "gatewayConnectionLock": "gatewayConnectionLock", - "strongSignal": "strongSignal", - "mediumSignal": "mediumSignal", - "averageSignal": "averageSignal", - "weakSignal": "weakSignal", - "selectGatewayType": "selectGatewayType", - "addGateway": "addGateway", - "turnThePowerBackOn": "turnThePowerBackOn", - "indicatorLight": "indicatorLight", - "selectGatewayTypeNextTip": "selectGatewayTypeNextTip", - "selectGateway": "selectGateway", - "gatewayConfigurationWifiTip": "gatewayConfigurationWifiTip", - "wifiPassward": "wifiPassward", - "pleaseEnterTheWiFiPassword": "pleaseEnterTheWiFiPassword", - "gatewayName": "gatewayName", - "pleaseEnterGatewayName": "pleaseEnterGatewayName", - "wifiMAC": "wifiMAC", - "ipAddress": "ipAddress", - "subnetMask": "subnetMask", - "defaultGateway": "defaultGateway", - "automaticallyGetTheDNSServerAddress": "automaticallyGetTheDNSServerAddress", - "preferredDNS": "preferredDNS", - "alternativeDNS": "alternativeDNS", - "noStaticIPIsUsed": "noStaticIPIsUsed", + "状态": "状态", + "WiFi名称": "WiFi名称", + "网络MAC": "网络MAC", + "网关升级": "网关升级", + "网关连接的锁": "网关连接的锁", + "信号强": "信号强", + "选择网关类型": "选择网关类型", + "添加网关": "添加网关", + "重新通电": "重新通电", + "指示灯": "指示灯", + "将网关重新通电，指示灯交替闪烁时点击下一步": "将网关重新通电，指示灯交替闪烁时点击下一步", + "选择网关": "选择网关", + "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置": "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置", + "WiFi密码": "WiFi密码", + "请输入WiFi密码": "请输入WiFi密码", + "网关名称": "网关名称", + "请输入网关名称": "请输入网关名称", + "IP地址": "IP地址", + "子网掩码": "子网掩码", + "默认网关": "默认网关", + "自动获取DNS服务器地址": "自动获取DNS服务器地址", + "首选DNS": "首选DNS", + "备选DNS": "备选DNS", + "不使用静态IP": "不使用静态IP", - "allLock":"allLock", - "searchAllLockType":"searchAllLockType", - "doorLock":"doorLock", - "padlock":"padlock", - "safeLock":"safeLock", - "intelligentLockCore":"intelligentLockCore", - "itelligentAccessControl":"itelligentAccessControl", - "parkingLock":"parkingLock", - "bicycleLock":"bicycleLock", - "longRangeControl":"longRangeControl", - "lightTouchScreen":"lightTouchScreen", - "lightTouchScreenTip":"lightTouchScreenTip", - "next":"next", - "nearbyLock":"nearbyLock", - "addSuccessfullyPleaseRename":"addSuccessfullyPleaseRename", - "whenAddingLockThePhoneMustBeNextToTheLock":"whenAddingLockThePhoneMustBeNextToTheLock", + "所有锁":"所有锁", + "搜索所有锁类型":"搜索所有锁类型", + "门锁":"门锁", + "挂锁":"挂锁", + "保险箱锁":"保险箱锁", + "智能门禁":"智能门禁", + "车位锁":"车位锁", + "摸亮触摸屏":"摸亮触摸屏", + "摸亮触摸屏，锁进入可添加状态，点击下一步":"摸亮触摸屏，锁进入可添加状态，点击下一步", + "附近的锁":"附近的锁", + "如需修改名字请重新命名，点击确定添加锁":"如需修改名字请重新命名，点击确定添加锁", + "添加锁时，手机必须在锁旁边":"添加锁时，手机必须在锁旁边", - "login":"login", - "register":"register", - "forgetPassword":"forgetPassword", - "readAndAgree":"readAndAgree", - "verificationCode":"verificationCode", - "registerPasswordTip":"registerPasswordTip", - "iphone":"iphone", - "email":"email", - "mobileNumber":"mobileNumber", - "countryAndRegion":"countryAndRegion", - "select":"select", - "getVerificationCode":"getVerificationCode", + "登录":"登录", + "注册":"注册", + "我已阅读并同意":"我已阅读并同意", + "验证码":"验证码", + "密码必须是8-20位，至少包括数字/字母/符号中的2种":"密码必须是8-20位，至少包括数字/字母/符号中的2种", + "手机":"手机", + "邮箱":"邮箱", + "请输入邮箱": "请输入邮箱", + "国家/地区":"国家/地区", + "你所在的国家/地区": "你所在的国家/地区", + "选择国家/地区": "你所在的国家/地区", + "获取验证码":"获取验证码", - "businessCooperation":"businessCooperation", - "officialWebsite":"officialWebsite", - "computerWebVersion":"computerWebVersion", - "hotelSystem":"hotelSystem", - "manualWebVersion":"manualWebVersion", - "introduce":"introduce", + "商务合作":"商务合作", + "电脑网页版":"电脑网页版", + "酒店系统":"酒店系统", + "说明书网页版":"说明书网页版", - "note":"note", - "mail":"mail", - "advancedFunction":"advancedFunction", - "pushMessage":"pushMessage", - "recordsRetention":"recordsRetention", + "高级功能":"高级功能", + "记录保存":"记录保存", - "smsBuyTip":"smsBuyTip", - "emailBuyTip":"emailBuyTip", - "currentRemainingQuantity":"currentRemainingQuantity", - "buy":"buy", - "customSMSTemplate":"customSMSTemplate", - "customMailTemplate":"customMailTemplate", - "record":"record", - "buyRealNameTip":"buyRealNameTip", - "buyRealNameSelectYouWantBuyTip":"buyRealNameSelectYouWantBuyTip", - "forTheFirstTime":"forTheFirstTime", - "onceDay":"onceDay", - "weekOnce":"weekOnce", - "monthOnce":"monthOnce", - "currentState":"currentState", - "onTrial":"onTrial", - "haveNotOpened":"haveNotOpened", - "advancedFeaturesAndBenefitsContent":"advancedFeaturesAndBenefitsContent", - "smsTemplate":"smsTemplate", - "emailTemplate":"emailTemplate", - "cardIssuingtool":"cardIssuingtool", - "titleForBuyingAdvancedFeatures":"titleForBuyingAdvancedFeatures", - "tipsForBuyingAdvancedFeatures":"tipsForBuyingAdvancedFeatures", - "freeTrial":"freeTrial", - "openNow":"openNow", + "您可通过短信将密码、电子钥匙信息发给接收人。":"您可通过短信将密码、电子钥匙信息发给接收人。", + "您可通过邮件将密码、电子钥匙信息发给接收人。":"您可通过邮件将密码、电子钥匙信息发给接收人。", + "购买实名认证提示":"购买实名认证提示", + "请选择你希望的实名认证频次":"请选择你希望的实名认证频次", + "仅首次":"仅首次", + "每日一次":"每日一次", + "每周一次":"每周一次", + "每月一次":"每月一次", + "当前状态":"当前状态", + "试用中":"试用中", + "高级功能权益内容":"高级功能权益内容", + "短信模板":"短信模板", + "邮件模板":"邮件模板", + "发卡工具":"发卡工具", + "购买高级功能须知":"购买高级功能须知", + "购买高级功能提示":"购买高级功能提示", + "免费体验":"免费体验", + "立即开通":"立即开通", "buySMS":"buySMS", "buyMail":"buyMail", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index 7aa81579..d78cd30e 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -169,158 +169,127 @@ "NFC无源锁": "NFC无源锁", "添加设备": "添加设备", "网关": "网关", + "客服": "客服", + "设置": "设置", + "更多设置": "更多设置", - "supportStaff": "客服", - "set": "设置", - "moreServices": "更多服务", - "moreSet": "更多设置", - "prompTone": "提示音", - "touchUnlock": "触摸开锁", - "pushNotification": "消息推送", - "lockUserManagement": "锁用户管理", - "ownedKey": "拥有的钥匙", - "authorityManagement": "批量授权", - "associatedDevice": "关联设备", - "associatedName": "关联姓名", - "device": "设备", - "authorizedAdmin": "授权管理员", - "addAuthorizedAdmin": "添加授权管理员", - "lockGroup": "锁分组", - "transferSmartLock": "转移智能锁", - "selectiveLock": "选择锁", - "recipientInformation": "接收人信息", - "transferGateway": "转移网关", - "multiLanguage": "多语言", - "lockScreen": "锁屏", - "closed": "已关闭", - "opened": "已开启", - "close": "关闭", - "open": "开启", - "hideInvalidUnlockPermissions": "隐藏无效开锁权限", - "appUnlockRequiresMobilePhoneAccessToTheLock": "APP开锁时需手机连网的锁", - "valueAddedServices": "增值服务", - "about": "关于", - "userAgreement": "用户协议", - "privacyPolicy": "隐私政策", - "personalInformationCollectionList": "个人信息收集清单", - "applicationPermissionDescription": "应用权限说明", - "thirdPartyInformationSharingList": "第三方信息共享清单", - "logout": "退出", - "deleteAccount": "删除账号", - "personalInformation": "个人信息", - "avatar": "头像", - "nickName": "昵称", - "changeNickName": "修改昵称", - "modifyAccount": "修改账号", + "消息推送": "消息推送", + "锁用户管理": "锁用户管理", + "拥有的钥匙": "拥有的钥匙", + "批量授权": "批量授权", + "关联设备": "关联设备", + "关联姓名": "关联姓名", + "转移智能锁": "转移智能锁", + "选择锁": "选择锁", + "接收人信息": "接收人信息", + "转移网关": "转移网关", + "锁屏": "锁屏", + "已关闭": "已关闭", + "已开启": "已开启", + "开启": "开启", + "确定要开启重置键?": "确定要开启重置键?", + "确定要关闭重置键?": "确定要关闭重置键?", + "隐藏无效开锁权限": "隐藏无效开锁权限", + "APP开锁时需手机连网的锁": "APP开锁时需手机连网的锁", + "增值服务": "增值服务", + "关于": "关于", + "退出": "退出", + "删除账号": "删除账号", + "个人信息": "个人信息", + "头像": "头像", + "昵称": "昵称", + "请输入昵称": "请输入昵称", + "修改昵称": "修改昵称", + "修改账号": "修改账号", "重置密码": "重置密码", - "safetyProblem": "安全问题", - "modifyAccountTip": "为了你的账号安全，修改账号前请先使用验证码验证", - "pleaseEnterAccountNumber": "请输入账号", - "pleaseEnterNewAccountNumber": "请输入新账号", - "changeIphoneTip": "找回密码和登录新设备时，可通过绑定的手机验证", - "changeEmailTip": "找回密码和登录新设备时，可通过绑定的邮箱验证", - "goBind": "去绑定", - "originalPassword": "原密码", - "newPassword": "新密码", + "安全问题": "安全问题", + "为了你的账号安全，修改账号前请先使用验证码验证": "为了你的账号安全，修改账号前请先使用验证码验证", + "请输入新账号": "请输入新账号", + "找回密码和登录新设备时，可通过绑定的手机验证": "找回密码和登录新设备时，可通过绑定的手机验证", + "找回密码和登录新设备时，可通过绑定的邮箱验证": "找回密码和登录新设备时，可通过绑定的邮箱验证", + "原密码": "原密码", + "新密码": "新密码", "确认密码": "确认密码", - "safetyProblemTip": "当你手机丢了，可以通过回答设置的安全问题来登录新设备", - "problemOne": "问题一", - "problemTwo": "问题二", - "problemThree": "问题三", - "pleaseEnterYourAnswer": "请输入你的答案", - "aboutToExpire": "即将到期", - "changeName": "修改名称", - "deAuthorize": "去授权", - "designation": "名称", - "state": "状态", - "wifiName": "WiFi名称", - "networkMAC": "网络MAC", - "gatewayUpgrade": "网关升级", - "gatewayConnectionLock": "网关连接的锁", - "strongSignal": "信号强", - "mediumSignal": "信号中等", - "averageSignal": "信号一般", - "weakSignal": "信号弱", - "selectGatewayType": "选择网关类型", - "addGateway": "添加网关", - "turnThePowerBackOn": "重新通电", - "indicatorLight": "指示灯", - "selectGatewayTypeNextTip": "将网关重新通电，指示灯交替闪烁时点击下一步", - "selectGateway": "选择网关", - "gatewayConfigurationWifiTip": "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置", - "wifiPassward": "WiFi密码", - "pleaseEnterTheWiFiPassword": "请输入WiFi密码", - "gatewayName": "网关名称", - "pleaseEnterGatewayName": "请输入网关名称", - "wifiMAC": "网络MAC", - "ipAddress": "IP地址", - "subnetMask": "子网掩码", - "defaultGateway": "默认网关", - "automaticallyGetTheDNSServerAddress": "自动获取DNS服务器地址", - "preferredDNS": "首选DNS", - "alternativeDNS": "备选DNS", - "noStaticIPIsUsed": "不使用静态IP", - "allLock": "所有锁", - "searchAllLockType": "搜索所有锁类型", - "doorLock": "门锁", - "padlock": "挂锁", - "safeLock": "保险箱锁", - "intelligentLockCore": "智能锁芯", - "itelligentAccessControl": "智能门禁", - "parkingLock": "车位锁", - "bicycleLock": "自行车锁", - "longRangeControl": "远程控制", - "lightTouchScreen": "摸亮触摸屏", - "lightTouchScreenTip": "摸亮触摸屏，锁进入可添加状态，点击下一步", - "next": "下一步", - "nearbyLock": "附近的锁", - "addSuccessfullyPleaseRename": "如需修改名字请重新命名，点击确定添加锁", - "whenAddingLockThePhoneMustBeNextToTheLock": "添加锁时，手机必须在锁旁边", - "login": "登录", - "register": "注册", - "forgetPassword": "忘记密码", - "readAndAgree": "我已阅读并同意", - "verificationCode": "验证码", - "registerPasswordTip": "密码必须是8-20位，至少包括数字/字母/符号中的2种", - "iphone": "手机", - "email": "邮箱", - "mobileNumber": "手机号", - "countryAndRegion": "国家/地区", - "select": "选择", - "getVerificationCode": "获取验证码", - "businessCooperation": "商务合作", - "officialWebsite": "官网", - "computerWebVersion": "电脑网页版", - "hotelSystem": "酒店系统", - "manualWebVersion": "说明书网页版", - "introduce": "介绍", - "note": "短信", - "mail": "邮件", - "advancedFunction": "高级功能", - "pushMessage": "推送", - "recordsRetention": "记录保存", - "smsBuyTip": "您可通过短信将密码、电子钥匙信息发给接收人。", - "emailBuyTip": "您可通过邮件将密码、电子钥匙信息发给接收人。", - "currentRemainingQuantity": "当前剩余数量", - "buy": "购买", - "record": "记录", - "buyRealNameTip": "给用户发送电子钥匙时，可以要求其开锁前先进行人脸识别，以保证是他本人在操作。人脸实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。", - "buyRealNameSelectYouWantBuyTip": "请选择你希望的实名认证频次", - "forTheFirstTime": "仅首次", - "onceDay": "每日一次", - "weekOnce": "每周一次", - "monthOnce": "每月一次", - "currentState": "当前状态", - "onTrial": "试用中", - "haveNotOpened": "未开通", - "advancedFeaturesAndBenefitsContent": "高级功能权益内容", - "smsTemplate": "短信模板", - "emailTemplate": "邮件模板", - "cardIssuingtool": "发卡工具", - "titleForBuyingAdvancedFeatures": "购买高级功能须知", - "tipsForBuyingAdvancedFeatures": "更多的高级功能正在开发中，如果您需要这些功能，欢迎根据锁的数量开通服务。高级功能仅能用于您自己的锁。如果您是授权管理员，请联系锁的最高管理员开通服务。", - "freeTrial": "免费体验", - "openNow": "立即开通", + "当你手机丢了，可以通过回答设置的安全问题来登录新设备": "当你手机丢了，可以通过回答设置的安全问题来登录新设备", + "问题一": "问题一", + "问题二": "问题二", + "问题三": "问题三", + "请输入你的答案": "请输入你的答案", + "即将到期": "即将到期", + "修改名称": "修改名称", + "去授权": "去授权", + "状态": "状态", + "WiFi名称": "WiFi名称", + "网络MAC": "网络MAC", + "网关升级": "网关升级", + "网关连接的锁": "网关连接的锁", + "信号强": "信号强", + "选择网关类型": "选择网关类型", + "添加网关": "添加网关", + "重新通电": "重新通电", + "指示灯": "指示灯", + "将网关重新通电，指示灯交替闪烁时点击下一步": "将网关重新通电，指示灯交替闪烁时点击下一步", + "选择网关": "选择网关", + "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置": "不支持5G WiFi网络，请选择2.4G WiFi网络进行配置", + "WiFi密码": "WiFi密码", + "请输入WiFi密码": "请输入WiFi密码", + "网关名称": "网关名称", + "请输入网关名称": "请输入网关名称", + "IP地址": "IP地址", + "子网掩码": "子网掩码", + "默认网关": "默认网关", + "自动获取DNS服务器地址": "自动获取DNS服务器地址", + "首选DNS": "首选DNS", + "备选DNS": "备选DNS", + "不使用静态IP": "不使用静态IP", + "所有锁": "所有锁", + "搜索所有锁类型": "搜索所有锁类型", + "门锁": "门锁", + "挂锁": "挂锁", + "保险箱锁": "保险箱锁", + "智能门禁": "智能门禁", + "车位锁": "车位锁", + "摸亮触摸屏": "摸亮触摸屏", + "摸亮触摸屏，锁进入可添加状态，点击下一步": "摸亮触摸屏，锁进入可添加状态，点击下一步", + "附近的锁": "附近的锁", + "如需修改名字请重新命名，点击确定添加锁": "如需修改名字请重新命名，点击确定添加锁", + "添加锁时，手机必须在锁旁边": "添加锁时，手机必须在锁旁边", + "登录": "登录", + "注册": "注册", + "我已阅读并同意": "我已阅读并同意", + "验证码": "验证码", + "密码必须是8-20位，至少包括数字/字母/符号中的2种": "密码必须是8-20位，至少包括数字/字母/符号中的2种", + "手机": "手机", + "邮箱": "邮箱", + "请输入邮箱": "请输入邮箱", + "国家/地区": "国家/地区", + "你所在的国家/地区": "你所在的国家/地区", + "选择国家/地区": "你所在的国家/地区", + "获取验证码": "获取验证码", + "商务合作": "商务合作", + "电脑网页版": "电脑网页版", + "酒店系统": "酒店系统", + "说明书网页版": "说明书网页版", + "高级功能": "高级功能", + "记录保存": "记录保存", + "您可通过短信将密码、电子钥匙信息发给接收人。": "您可通过短信将密码、电子钥匙信息发给接收人。", + "您可通过邮件将密码、电子钥匙信息发给接收人。": "您可通过邮件将密码、电子钥匙信息发给接收人。", + "购买实名认证提示": "给用户发送电子钥匙时，可以要求其开锁前先进行人脸识别，以保证是他本人在操作。人脸实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。", + "请选择你希望的实名认证频次": "请选择你希望的实名认证频次", + "仅首次": "仅首次", + "每日一次": "每日一次", + "每周一次": "每周一次", + "每月一次": "每月一次", + "当前状态": "当前状态", + "试用中": "试用中", + "高级功能权益内容": "高级功能权益内容", + "短信模板": "短信模板", + "邮件模板": "邮件模板", + "发卡工具": "发卡工具", + "购买高级功能须知": "购买高级功能须知", + "购买高级功能提示": "更多的高级功能正在开发中，如果您需要这些功能，欢迎根据锁的数量开通服务。高级功能仅能用于您自己的锁。如果您是授权管理员，请联系锁的最高管理员开通服务。", + "免费体验": "免费体验", + "立即开通": "立即开通", "buySMS": "购买短信", "buyMail": "购买邮件", "buyRealNameAuthenticationTimes": "购买实名认证次数", diff --git a/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_page.dart index 57684f35..fc0a1eda 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_page.dart @@ -59,7 +59,7 @@ class _StarLockForgetPasswordPageState SizedBox(width: 5.w), Expanded( child: Text( - TranslationLoader.lanKeys!.countryAndRegion!.tr, + '国家/地区'.tr, style: TextStyle( fontSize: 26.sp, color: AppColors.blackColor))), SizedBox(width: 20.w), @@ -134,7 +134,7 @@ class _StarLockForgetPasswordPageState ]), SizedBox(height: 15.w), Text( - TranslationLoader.lanKeys!.registerPasswordTip!.tr, + '密码必须是8-20位，至少包括数字/字母/符号中的2种'.tr, style: TextStyle( color: AppColors.placeholderTextColor, fontSize: 20.sp), ), diff --git a/lib/login/forgetPassword/starLock_forgetPassword_state.dart b/lib/login/forgetPassword/starLock_forgetPassword_state.dart index 8772c014..2709c268 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_state.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_state.dart @@ -5,6 +5,10 @@ import 'package:get/get.dart'; import '../../translations/trans_lib.dart'; class StarLockForgetPasswordState { + + StarLockForgetPasswordState() { + resetResend(); + } final TextEditingController phoneController = TextEditingController(); final TextEditingController pwdController = TextEditingController(); final TextEditingController sureController = TextEditingController(); @@ -14,36 +18,32 @@ class StarLockForgetPasswordState { return DateTime.now().millisecondsSinceEpoch; } - var countryCode = "86".obs; - var countryName = '中国'.tr.obs; - var codeType = '2'.obs; // 1:邮箱 2:手机 - var pwd = ''.obs; - var surePwd = ''.obs; - var verificationCode = ''.obs; - var xWidth = ''.obs; // 滑动验证码滑动位置 - var canSub = false.obs; - var phoneStr = ''.obs; - var phoneStrIsOK = false.obs; - var date = currentTimeMillis().toString().obs; + RxString countryCode = '86'.obs; + RxString countryName = '中国'.tr.obs; + RxString codeType = '2'.obs; // 1:邮箱 2:手机 + RxString pwd = ''.obs; + RxString surePwd = ''.obs; + RxString verificationCode = ''.obs; + RxString xWidth = ''.obs; // 滑动验证码滑动位置 + RxBool canSub = false.obs; + RxString phoneStr = ''.obs; + RxBool phoneStrIsOK = false.obs; + RxString date = currentTimeMillis().toString().obs; // bool get isIphone => RegexUtil.isMobileSimple(phoneStr.value); bool get pwdIsOK => pwd.value.isNotEmpty && (pwd.value == surePwd.value); bool get codeIsOK => verificationCode.value.isNotEmpty; - var canResend = false.obs; - var btnText = ''.obs; - var totalSeconds = 120; - var currentSecond = 120; - - StarLockForgetPasswordState() { - resetResend(); - } + RxBool canResend = false.obs; + RxString btnText = ''.obs; + int totalSeconds = 120; + int currentSecond = 120; void resetResend() { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() { diff --git a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart index a0dc857e..f5f8eb64 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart @@ -57,7 +57,7 @@ class _StarLockForgetPasswordPageState child: Row( children: [ SizedBox(width: 5.w), - Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, + Text('国家/地区'.tr, style: TextStyle( fontSize: 26.sp, color: AppColors.blackColor)), SizedBox(width: 60.w), @@ -108,7 +108,7 @@ class _StarLockForgetPasswordPageState LengthLimitingTextInputFormatter(20), ]), Text( - TranslationLoader.lanKeys!.registerPasswordTip!.tr, + '密码必须是8-20位，至少包括数字/字母/符号中的2种'.tr, style: TextStyle( color: AppColors.placeholderTextColor, fontSize: 20.sp), ), diff --git a/lib/login/login/starLock_login_page.dart b/lib/login/login/starLock_login_page.dart index 3dd07ba8..6ce4cad3 100755 --- a/lib/login/login/starLock_login_page.dart +++ b/lib/login/login/starLock_login_page.dart @@ -43,7 +43,7 @@ class _StarLockLoginPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.login!.tr, + barTitle: '登录'.tr, haveBack: false, backgroundColor: AppColors.mainColor, actionsList: [ @@ -55,7 +55,7 @@ class _StarLockLoginPageState extends State { )), TextButton( child: Text( - TranslationLoader.lanKeys!.register!.tr, + '注册'.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () async { @@ -82,7 +82,7 @@ class _StarLockLoginPageState extends State { SizedBox(height: 50.w), Obx(() => CommonItem( leftTitel: - "${"你所在的".tr}${TranslationLoader.lanKeys!.countryAndRegion!.tr}", + '你所在的国家/地区'.tr, rightTitle: '', isHaveLine: true, isPadding: false, @@ -175,7 +175,7 @@ class _StarLockLoginPageState extends State { Flexible( child: RichText( text: TextSpan( - text: TranslationLoader.lanKeys!.readAndAgree!.tr, + text: '我已阅读并同意'.tr, style: TextStyle( color: const Color(0xff333333), fontSize: 20.sp), children: [ @@ -183,7 +183,7 @@ class _StarLockLoginPageState extends State { alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + '《${'用户协议'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), @@ -199,7 +199,7 @@ class _StarLockLoginPageState extends State { alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + '《${'隐私政策'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), @@ -218,7 +218,7 @@ class _StarLockLoginPageState extends State { ), SizedBox(height: 50.w), Obx(() => SubmitBtn( - btnName: TranslationLoader.lanKeys!.login!.tr, + btnName: '登录'.tr, fontSize: 28.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), @@ -244,7 +244,7 @@ class _StarLockLoginPageState extends State { // color: Colors.red, child: Center( child: Text( - '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + '${'忘记密码'.tr}？', style: TextStyle( fontSize: 22.sp, color: AppColors.mainColor)), ), diff --git a/lib/login/login/starLock_login_xhj_page.dart b/lib/login/login/starLock_login_xhj_page.dart index 4f23fb50..b617656c 100755 --- a/lib/login/login/starLock_login_xhj_page.dart +++ b/lib/login/login/starLock_login_xhj_page.dart @@ -91,7 +91,7 @@ class _StarLockLoginPageState extends State { width: 5.w, ), Text( - TranslationLoader.lanKeys!.countryAndRegion!.tr, + '国家/地区'.tr, style: TextStyle( fontSize: 22.sp, color: AppColors.darkGrayTextColor), @@ -180,13 +180,13 @@ class _StarLockLoginPageState extends State { ), ), Row(children: [ - Text(TranslationLoader.lanKeys!.readAndAgree!.tr, + Text('我已阅读并同意'.tr, style: TextStyle( color: const Color(0xff333333), fontSize: 20.sp)), GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + '《${'用户协议'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), @@ -200,7 +200,7 @@ class _StarLockLoginPageState extends State { ), GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + '《${'隐私政策'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), @@ -224,7 +224,7 @@ class _StarLockLoginPageState extends State { children: [ SizedBox(height: 5.w), Obx(() => SubmitBtn( - btnName: TranslationLoader.lanKeys!.login!.tr, + btnName: '登录'.tr, fontSize: 28.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), @@ -258,7 +258,7 @@ class _StarLockLoginPageState extends State { style: ElevatedButton.styleFrom( backgroundColor: AppColors.mainColor), child: Text( - TranslationLoader.lanKeys!.register!.tr, + '注册'.tr, style: TextStyle(fontSize: 22.sp, color: Colors.white), ), @@ -275,7 +275,7 @@ class _StarLockLoginPageState extends State { // color: Colors.red, child: Center( child: Text( - '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + '${'忘记密码'.tr}？', style: TextStyle( fontSize: 22.sp, color: AppColors.mainColor)), diff --git a/lib/login/register/starLock_register_page.dart b/lib/login/register/starLock_register_page.dart index 6f844e29..99a0da5e 100755 --- a/lib/login/register/starLock_register_page.dart +++ b/lib/login/register/starLock_register_page.dart @@ -32,7 +32,7 @@ class _StarLockRegisterPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.register!.tr, + barTitle: '注册'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( @@ -42,7 +42,7 @@ class _StarLockRegisterPageState extends State { middleTFWidget(), Obx(() { return SubmitBtn( - btnName: TranslationLoader.lanKeys!.register!.tr, + btnName: '注册'.tr, // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey], fontSize: 30.sp, borderRadius: 20.w, @@ -101,7 +101,7 @@ class _StarLockRegisterPageState extends State { : null, child: Center( child: Text( - TranslationLoader.lanKeys!.iphone!.tr, + '手机'.tr, style: TextStyle( color: state.isIphoneType.value ? Colors.white @@ -127,7 +127,7 @@ class _StarLockRegisterPageState extends State { color: AppColors.greyLineColor)), child: Center( child: Text( - TranslationLoader.lanKeys!.email!.tr, + '邮箱'.tr, style: TextStyle( color: state.isIphoneType.value ? Colors.black @@ -160,7 +160,7 @@ class _StarLockRegisterPageState extends State { SizedBox(width: 5.w), Expanded( child: Text( - "${"你所在的".tr}${TranslationLoader.lanKeys!.countryAndRegion!.tr}", + '你所在的国家/地区'.tr, style: TextStyle( fontSize: 26.sp, color: AppColors.blackColor))), SizedBox(width: 20.w), @@ -216,7 +216,7 @@ class _StarLockRegisterPageState extends State { ), ), hintText: - "${"请输入".tr}${state.isIphoneType.value ? "手机号".tr : TranslationLoader.lanKeys!.email!.tr}", + state.isIphoneType.value ? '请输入手机号'.tr : '请输入邮箱'.tr, keyboardType: TextInputType.number, inputFormatters: [ // FilteringTextInputFormatter.allow(RegExp('[0-9]')), @@ -244,7 +244,7 @@ class _StarLockRegisterPageState extends State { ]), SizedBox(height: 15.w), Text( - TranslationLoader.lanKeys!.registerPasswordTip!.tr, + '密码必须是8-20位，至少包括数字/字母/符号中的2种'.tr, style: TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp), ), @@ -357,14 +357,14 @@ class _StarLockRegisterPageState extends State { Flexible( child: RichText( text: TextSpan( - text: TranslationLoader.lanKeys!.readAndAgree!.tr, + text: '我已阅读并同意'.tr, style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp), children: [ WidgetSpan( alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + '《${'用户协议'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { @@ -378,7 +378,7 @@ class _StarLockRegisterPageState extends State { alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + '《${'隐私政策'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { diff --git a/lib/login/register/starLock_register_state.dart b/lib/login/register/starLock_register_state.dart index 4dc202aa..20ec4af9 100755 --- a/lib/login/register/starLock_register_state.dart +++ b/lib/login/register/starLock_register_state.dart @@ -42,7 +42,7 @@ class StarLockRegisterState { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() { diff --git a/lib/login/register/starLock_register_xhj_page.dart b/lib/login/register/starLock_register_xhj_page.dart index 39f8631c..0a7feaac 100755 --- a/lib/login/register/starLock_register_xhj_page.dart +++ b/lib/login/register/starLock_register_xhj_page.dart @@ -31,7 +31,7 @@ class _StarLockRegisterPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: Colors.white, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.register!.tr, + barTitle: '注册'.tr, haveBack: true, iconColor: AppColors.blackColor, titleColor: AppColors.blackColor, @@ -47,7 +47,7 @@ class _StarLockRegisterPageState extends State { ), Obx(() { return SubmitBtn( - btnName: TranslationLoader.lanKeys!.register!.tr, + btnName: '注册'.tr, // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey], fontSize: 30.sp, borderRadius: 20.w, @@ -85,8 +85,8 @@ class _StarLockRegisterPageState extends State { dividerHeight: 0, indicatorSize: TabBarIndicatorSize.tab, tabs: [ - Text(TranslationLoader.lanKeys!.iphone!.tr), - Text(TranslationLoader.lanKeys!.email!.tr) + Text('手机'.tr), + Text('邮箱'.tr) ], indicatorColor: AppColors.mainColor, labelStyle: @@ -116,7 +116,7 @@ class _StarLockRegisterPageState extends State { child: Row( children: [ SizedBox(width: 5.w), - Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, + Text('国家/地区'.tr, style: TextStyle( fontSize: 26.sp, color: AppColors.blackColor)), SizedBox(width: 50.w), @@ -144,8 +144,7 @@ class _StarLockRegisterPageState extends State { logic.checkNext(state.phoneOrEmailController); }, leftWidget: SizedBox(), - label: - "${'请输入'.tr}${state.isIphoneType.value ? "手机号".tr : TranslationLoader.lanKeys!.email!.tr}", + label:state.isIphoneType.value ? '请输入手机号'.tr : '请输入邮箱'.tr, keyboardType: TextInputType.number, inputFormatters: [ LengthLimitingTextInputFormatter(30), @@ -162,9 +161,9 @@ class _StarLockRegisterPageState extends State { LengthLimitingTextInputFormatter(20), ]), Text( - TranslationLoader.lanKeys!.registerPasswordTip!.tr, + '密码必须是8-20位，至少包括数字/字母/符号中的2种'.tr, style: - TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp), + TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp), ), LoginInput( controller: state.sureController, @@ -258,7 +257,7 @@ class _StarLockRegisterPageState extends State { Flexible( child: RichText( text: TextSpan( - text: TranslationLoader.lanKeys!.readAndAgree!.tr, + text: '我已阅读并同意'.tr, style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp), children: [ @@ -266,7 +265,7 @@ class _StarLockRegisterPageState extends State { alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.userAgreement!.tr}》', + '《${'用户协议'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { @@ -280,7 +279,7 @@ class _StarLockRegisterPageState extends State { alignment: PlaceholderAlignment.middle, child: GestureDetector( child: Text( - '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', + '《${'隐私政策'.tr}》', style: TextStyle( color: AppColors.mainColor, fontSize: 20.sp)), onTap: () { diff --git a/lib/login/selectCountryRegion/selectCountryRegion_page.dart b/lib/login/selectCountryRegion/selectCountryRegion_page.dart index c04ecfbb..1a195cd9 100755 --- a/lib/login/selectCountryRegion/selectCountryRegion_page.dart +++ b/lib/login/selectCountryRegion/selectCountryRegion_page.dart @@ -85,7 +85,7 @@ class _SelectCountryRegionPageState extends State { backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( barTitle: - '${TranslationLoader.lanKeys!.select!.tr} ${TranslationLoader.lanKeys!.countryAndRegion!.tr}', + '选择国家/地区'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart index 641a4a1c..536dbdf0 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart @@ -57,7 +57,7 @@ class _AuthorizedAdminPageState extends State return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + barTitle: '授权管理员'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -114,7 +114,7 @@ class _AuthorizedAdminPageState extends State isHaveRightWidget: true, rightWidget: getTFWidget(true, '请输入手机号或者邮箱'.tr, 1)), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart index 28daf30b..88a08dd9 100755 --- a/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart @@ -54,7 +54,7 @@ class _AuthorizedAdminListPageState extends State { backgroundColor: AppColors.mainBackgroundColor, resizeToAvoidBottomInset: false, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + barTitle: '授权管理员'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), @@ -73,7 +73,7 @@ class _AuthorizedAdminListPageState extends State { height: 20.h, ), AddBottomWhiteBtn( - btnName: TranslationLoader.lanKeys!.addAuthorizedAdmin!.tr, + btnName: '添加授权管理员'.tr, onClick: () { Navigator.pushNamed(context, Routers.authorizedAdminPage) .then((Object? val) { diff --git a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart index 2dee0dff..3c2d3263 100755 --- a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart +++ b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart @@ -94,7 +94,7 @@ class _VolumeAuthorizationLockPageState '请输入手机号或者邮箱'.tr, state.emailOrPhoneController)), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/card/addCardType/addCardType_page.dart b/lib/main/lockDetail/card/addCardType/addCardType_page.dart index 061c2aed..24cff990 100755 --- a/lib/main/lockDetail/card/addCardType/addCardType_page.dart +++ b/lib/main/lockDetail/card/addCardType/addCardType_page.dart @@ -286,7 +286,7 @@ class _AddCardPageState extends State )), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index 7f052475..f7efa4f3 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -113,8 +113,7 @@ class _CheckingInAddStaffPageState extends State { '请输入员工账号'.tr, state.staffAccountController)), CommonItem( - leftTitel: - TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel:'国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart index 931d3b52..aa0e7356 100755 --- a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart +++ b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendElectronicKey/massSendElectronicKey_page.dart @@ -174,7 +174,7 @@ class _MassSendElectronicKeyPageState extends State { }, )), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart index 25075086..58f015cb 100755 --- a/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart +++ b/lib/main/lockDetail/electronicKey/massSendElectronicKey/massSendLockGroupList/massSendReceiver/massSendReceiver_page.dart @@ -111,7 +111,7 @@ class _MassSendReceiverPageState extends State { Obx(() => Visibility( visible: state.isVip.value, child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart index 15103080..9f1312d1 100755 --- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart +++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart @@ -116,7 +116,7 @@ class _SendElectronicKeyViewState extends State 1, logic)), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart b/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart index 3522e66d..0bd5778d 100755 --- a/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart +++ b/lib/main/lockDetail/face/addFaceType/addFaceType_page.dart @@ -270,7 +270,7 @@ class _AddFaceTypePageState extends State with SingleTickerProv width: 60.w, height: 50.h, child: _isAdmin())))), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart b/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart index 8317abaa..444cf4f1 100755 --- a/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart +++ b/lib/main/lockDetail/fingerprint/addFingerprintSelectType/addFingerprintType_page.dart @@ -277,7 +277,7 @@ class _AddFingerprintTypePageState extends State with Si ), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart b/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart index e17320f3..5b4e9d69 100755 --- a/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart +++ b/lib/main/lockDetail/iris/addIrisType/addIrisType_page.dart @@ -256,7 +256,7 @@ class _AddIrisTypePageState extends State { SizedBox(width: 60.w, height: 50.h, child: _isAdmin())))), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index 5a12b1f4..cedd01cf 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -134,7 +134,7 @@ class _LockDetailPageState extends State child: bottomWidget()), btnText( img: 'images/main/icon_main_set.png', - text: TranslationLoader.lanKeys!.set!.tr, + text: '设置'.tr, onTap: () { if (state.openDoorBtnisUneable.value == false) { return; @@ -779,7 +779,7 @@ class _LockDetailPageState extends State state.keyInfos.value.isLockOwner == 1 ? TranslationLoader.lanKeys!.superAdmin!.tr : (state.keyInfos.value.keyRight == 1 - ? TranslationLoader.lanKeys!.authorizedAdmin!.tr + ? '授权管理员'.tr : TranslationLoader.lanKeys!.normalUser!.tr), style: TextStyle(fontSize: 20.sp, color: AppColors.darkGrayTextColor), ), @@ -1016,7 +1016,7 @@ class _LockDetailPageState extends State // 设置 if (F.isSKY) { showWidgetArr.add(bottomItem('images/main/icon_main_set.png', - TranslationLoader.lanKeys!.set!.tr, true, () { + '设置'.tr, true, () { Get.toNamed(Routers.lockSetPage, arguments: { 'lockId': state.keyInfos.value.lockId, 'isOnlyOneData': state.isOnlyOneData @@ -1153,7 +1153,7 @@ class _LockDetailPageState extends State if (state.keyInfos.value.isLockOwner == 1) { showWidgetArr.add(bottomItem( 'images/main/icon_main_authorizedAdmin.png', - TranslationLoader.lanKeys!.authorizedAdmin!.tr, + '授权管理员'.tr, state.bottomBtnisEable.value, () { Get.toNamed(Routers.authorizedAdminListPage, arguments: { @@ -1206,7 +1206,7 @@ class _LockDetailPageState extends State endWiddget.add( // 设置 bottomItem('images/main/icon_main_set.png', - TranslationLoader.lanKeys!.set!.tr, true, () { + '设置'.tr, true, () { // logic.clickItemBtnAction(10); Get.toNamed(Routers.lockSetPage, arguments: { 'lockId': state.keyInfos.value.lockId, diff --git a/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart b/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart index 65053379..67757ecf 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/editLockName/editLockName_page.dart @@ -27,7 +27,7 @@ class _EditLockNamePageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.changeName!.tr, + barTitle: '修改名称'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart index 22afa577..b0c04a97 100755 --- a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart +++ b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart @@ -54,7 +54,7 @@ class _BurglarAlarmPageState extends State with RouteAware{ children: [ Expanded( child: Text( - "${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}", style: TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w600), )), @@ -64,7 +64,7 @@ class _BurglarAlarmPageState extends State with RouteAware{ height: 40.h, ), Obx(() => SubmitBtn( - btnName: state.burglarAlarmEnable.value == 1 ? TranslationLoader.lanKeys!.close!.tr : TranslationLoader.lanKeys!.open!.tr, + btnName: state.burglarAlarmEnable.value == 1 ? '关闭'.tr : '开启'.tr, borderRadius: 20.w, fontSize: 32.sp, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart index 1006645d..433fcf12 100755 --- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart +++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_state.dart'; import '../../../../../app_settings/app_colors.dart'; import '../../../../../blue/blue_manage.dart'; @@ -22,8 +23,8 @@ class ConfiguringWifiPage extends StatefulWidget { } class _ConfiguringWifiPageState extends State with RouteAware { - final logic = Get.put(ConfiguringWifiLogic()); - final state = Get.find().state; + final ConfiguringWifiLogic logic = Get.put(ConfiguringWifiLogic()); + final ConfiguringWifiState state = Get.find().state; @override Widget build(BuildContext context) { @@ -34,10 +35,10 @@ class _ConfiguringWifiPageState extends State with RouteAwa haveBack: true, backgroundColor: AppColors.mainColor), body: Column( - children: [ - configuringWifiTFWidget(TranslationLoader.lanKeys!.wifiName!.tr, TranslationLoader.lanKeys!.pleaseEnterWifiName!.tr, state.wifiNameController), + children: [ + configuringWifiTFWidget('WiFi名称'.tr, TranslationLoader.lanKeys!.pleaseEnterWifiName!.tr, state.wifiNameController), Container(width: 1.sw, height: 1.h,color: AppColors.mainBackgroundColor), - configuringWifiTFWidget(TranslationLoader.lanKeys!.wifiPassward!.tr, TranslationLoader.lanKeys!.pleaseEnterWifiPwd!.tr, state.wifiPWDController), + configuringWifiTFWidget('请输入WiFi密码', TranslationLoader.lanKeys!.pleaseEnterWifiPwd!.tr, state.wifiPWDController), SizedBox(height: 50.h,), SubmitBtn(btnName: '确定'.tr, onClick: () { logic.senderConfiguringWifiAction(); @@ -49,11 +50,11 @@ class _ConfiguringWifiPageState extends State with RouteAwa Widget configuringWifiTFWidget( String titleStr, String rightTitle,TextEditingController controller) { return Column( - children: [ + children: [ Container(height: 10.h), CommonItem( leftTitel: titleStr, - rightTitle: "", + rightTitle: '', isHaveRightWidget: true, rightWidget: getTFWidget(rightTitle, controller)), Container(height: 10.h), @@ -67,7 +68,7 @@ class _ConfiguringWifiPageState extends State with RouteAwa height: 65.h, width: 300.w, child: Row( - children: [ + children: [ Expanded( child: TextField( //输入框一行 @@ -112,7 +113,6 @@ class _ConfiguringWifiPageState extends State with RouteAwa @override void didChangeDependencies() { - // TODO: implement didChangeDependencies super.didChangeDependencies(); /// 路由订阅 @@ -121,7 +121,6 @@ class _ConfiguringWifiPageState extends State with RouteAwa @override void dispose() { - // TODO: implement dispose /// 取消路由订阅 AppRouteObserver().routeObserver.unsubscribe(this); super.dispose(); diff --git a/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart b/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart index be27da15..7a8ec066 100755 --- a/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart +++ b/lib/main/lockDetail/lockSet/doorMagnetic/addDoorMagnetic/addDoorMagnetic_page.dart @@ -72,7 +72,7 @@ class _AddDoorMagneticPageState extends State { Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), child: SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () { Navigator.pushNamed(context, Routers.nearbyDoorMagneticPage); }), diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index 51b03723..c24c70f2 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -58,7 +58,7 @@ class _LockSetPageState extends State with WidgetsBindingObserver, return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.set!.tr, + barTitle: '设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: EasyRefreshTool( @@ -112,7 +112,7 @@ class _LockSetPageState extends State with WidgetsBindingObserver, leftTitel: '自动闭锁'.tr, rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0 ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond ?? 0}s' - : TranslationLoader.lanKeys!.closed!.tr, + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, // isHaveRightWidget: true, @@ -132,8 +132,8 @@ class _LockSetPageState extends State with WidgetsBindingObserver, child: CommonItem( leftTitel: '常开模式'.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, + ? '已开启'.tr + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -250,7 +250,7 @@ class _LockSetPageState extends State with WidgetsBindingObserver, leftTitel: '自动闭锁'.tr, rightTitle: state.lockSettingInfo.value.autoLock! > 0 ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond}s' - : TranslationLoader.lanKeys!.closed!.tr, + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, // isHaveRightWidget: true, @@ -285,7 +285,7 @@ class _LockSetPageState extends State with WidgetsBindingObserver, break; } } else { - titleStr = TranslationLoader.lanKeys!.closed!.tr; + titleStr = '已关闭'.tr; } return Visibility( visible: state.lockFeature.value.lockSound == 1, @@ -307,8 +307,8 @@ class _LockSetPageState extends State with WidgetsBindingObserver, child: CommonItem( leftTitel: '防撬报警'.tr, rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, + ? '已开启'.tr + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -325,8 +325,8 @@ class _LockSetPageState extends State with WidgetsBindingObserver, child: CommonItem( leftTitel: '常开模式'.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, + ? '已开启'.tr + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -341,8 +341,8 @@ class _LockSetPageState extends State with WidgetsBindingObserver, child: CommonItem( leftTitel: '远程开锁'.tr, rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, + ? '已开启'.tr + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -358,8 +358,8 @@ class _LockSetPageState extends State with WidgetsBindingObserver, child: CommonItem( leftTitel: '重置键'.tr, rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, + ? '已开启'.tr + : '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart b/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart index 04e8a8f2..523497f5 100755 --- a/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart +++ b/lib/main/lockDetail/lockSet/remoteUnlocking/remoteUnlocking_page.dart @@ -56,7 +56,7 @@ class _RemoteUnlockingPageState extends State with RouteAwa children: [ Expanded( child: Text( - "${"当前模式".tr} : ${state.remoteEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.remoteEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}", style: TextStyle( fontWeight: FontWeight.w600, fontSize: 22.sp), )), @@ -68,8 +68,8 @@ class _RemoteUnlockingPageState extends State with RouteAwa ), Obx(() => SubmitBtn( btnName: state.remoteEnable.value == 1 - ? TranslationLoader.lanKeys!.close!.tr - : TranslationLoader.lanKeys!.open!.tr, + ? '关闭'.tr + : '开启'.tr, onClick: () { //全自动锁只判断是否开启远程开锁 bool isContains = BlueManage().connectDeviceName.contains("T9A"); diff --git a/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart b/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart index 85936e75..dac60883 100755 --- a/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart +++ b/lib/main/lockDetail/lockSet/resetButton/resetButton_page.dart @@ -73,7 +73,7 @@ class _ResetButtonPageState extends State with RouteAware { children: [ Expanded( child: Text( - "${"当前模式".tr} : ${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}", + "${"当前模式".tr} : ${state.resetButtonEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}", style: TextStyle( fontWeight: FontWeight.w600, fontSize: 20.sp), )), @@ -84,8 +84,8 @@ class _ResetButtonPageState extends State with RouteAware { ), Obx(() => SubmitBtn( btnName: state.resetButtonEnable.value == 1 - ? TranslationLoader.lanKeys!.close!.tr - : TranslationLoader.lanKeys!.open!.tr, + ? '关闭'.tr + : '开启'.tr, borderRadius: 20.w, fontSize: 32.sp, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), @@ -93,7 +93,8 @@ class _ResetButtonPageState extends State with RouteAware { onClick: () { // showDeletAlertTipDialog(context); ShowTipView().showIosTipWithContentDialog( - '确定要${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.close!.tr : TranslationLoader.lanKeys!.open!.tr}重置键？', + state.resetButtonEnable.value == 1 ? '确定要关闭重置键?'.tr : '确定要开启重置键?'.tr, + // '确定要${state.resetButtonEnable.value == 1 ? '关闭'.tr : '开启'.tr}重置键？', logic.sendBurglarAlarm); })), ], diff --git a/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart b/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart index 3d5ebe2a..979bf91f 100755 --- a/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart +++ b/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboard/addWirelessKeyboard_page.dart @@ -36,7 +36,7 @@ class _AddWirelessKeyboardPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - TranslationLoader.lanKeys!.lightTouchScreen!.tr, + '摸亮触摸屏'.tr, style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), ), ], @@ -68,7 +68,7 @@ class _AddWirelessKeyboardPageState extends State { Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), child: SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () { Navigator.pushNamed( context, Routers.selectWirelessKeyboardPage); diff --git a/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart b/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart index 377a960e..59234a35 100755 --- a/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart +++ b/lib/main/lockDetail/lockSet/wirelessKeyboard/addWirelessKeyboardScreenNotLightOn/addWirelessKeyboardScreenNotLightOn_page.dart @@ -81,7 +81,7 @@ class _AddWirelessKeyboardScreenNotLightOnPageState Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), child: SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () { Navigator.pushNamed( context, Routers.selectWirelessKeyboardPage); diff --git a/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart b/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart index 38f06b82..719426c0 100755 --- a/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart +++ b/lib/main/lockDetail/palm/addPalmType/addPalmType_page.dart @@ -285,7 +285,7 @@ class _AddPalmTypePageState extends State with SingleTickerProv )), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockDetail/remoteControl/addRemoteControlType/addRemoteControlType_page.dart b/lib/main/lockDetail/remoteControl/addRemoteControlType/addRemoteControlType_page.dart index a3dc64f1..e699e23b 100755 --- a/lib/main/lockDetail/remoteControl/addRemoteControlType/addRemoteControlType_page.dart +++ b/lib/main/lockDetail/remoteControl/addRemoteControlType/addRemoteControlType_page.dart @@ -282,7 +282,7 @@ class _AddRemoteControlTypePageState extends State wit // )), SizedBox(height: 30.h), SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { diff --git a/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart b/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart index 421e77cd..0b04254f 100755 --- a/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart +++ b/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart @@ -297,7 +297,7 @@ class _DemoModeLockDetailPageState extends State { final List endWiddget = [ // 授权管理员 bottomItem('images/main/icon_main_authorizedAdmin.png', - TranslationLoader.lanKeys!.authorizedAdmin!.tr, () { + '授权管理员'.tr, () { // gotoLogin(); Get.toNamed(Routers.authorizedAdminListPage, @@ -321,7 +321,7 @@ class _DemoModeLockDetailPageState extends State { }), // 设置 bottomItem( - 'images/main/icon_main_set.png', TranslationLoader.lanKeys!.set!.tr, + 'images/main/icon_main_set.png', '设置'.tr, () { Get.toNamed(Routers.demoModeLockSetPage); }), diff --git a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart index e30ecffd..5fe9000d 100755 --- a/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart +++ b/lib/main/lockMian/demoMode/demoModeLockSet/demoModeLockSet_page.dart @@ -28,7 +28,7 @@ class _DemoModeLockSetPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.set!.tr, + barTitle: '设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -95,7 +95,7 @@ class _DemoModeLockSetPageState extends State { // 自动闭锁 CommonItem( leftTitel: '自动闭锁'.tr, - rightTitle: TranslationLoader.lanKeys!.closed!.tr, + rightTitle: '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -116,7 +116,7 @@ class _DemoModeLockSetPageState extends State { // 防撬报警 CommonItem( leftTitel: '防撬报警'.tr, - rightTitle: TranslationLoader.lanKeys!.closed!.tr, + rightTitle: '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -128,7 +128,7 @@ class _DemoModeLockSetPageState extends State { // 常开模式 CommonItem( leftTitel:'常开模式'.tr, - rightTitle: TranslationLoader.lanKeys!.closed!.tr, + rightTitle: '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -138,7 +138,7 @@ class _DemoModeLockSetPageState extends State { // 远程开锁 CommonItem( leftTitel: '远程开锁'.tr, - rightTitle: TranslationLoader.lanKeys!.closed!.tr, + rightTitle: '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -149,7 +149,7 @@ class _DemoModeLockSetPageState extends State { // 重置键 CommonItem( leftTitel: '重置键'.tr, - rightTitle: TranslationLoader.lanKeys!.closed!.tr, + rightTitle: '已关闭'.tr, isHaveLine: true, isHaveDirection: true, action: () { diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index 0171aedb..30c2362a 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -207,8 +207,7 @@ class _StarLockMainPageState extends State Container( // padding: EdgeInsets.all(30.w), child: Text( - TranslationLoader - .lanKeys!.whenAddingLockThePhoneMustBeNextToTheLock!.tr, + '添加锁时，手机必须在锁旁边'.tr, style: TextStyle( fontSize: 26.sp, // fontWeight: FontWeight.w800, diff --git a/lib/mine/about/about_page.dart b/lib/mine/about/about_page.dart index 6f036f25..9c9dba8c 100755 --- a/lib/mine/about/about_page.dart +++ b/lib/mine/about/about_page.dart @@ -51,12 +51,12 @@ class _AboutPageState extends State { backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.about!.tr, + barTitle: '关于'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.about!.tr, + barTitle: '关于'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -80,7 +80,7 @@ class _AboutPageState extends State { Widget view = Column( children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.introduce!.tr, + leftTitel: '介绍'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, @@ -97,7 +97,7 @@ class _AboutPageState extends State { endIndent: 20.w, ), CommonItem( - leftTitel: TranslationLoader.lanKeys!.userAgreement!.tr, + leftTitel: '隐私政策'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, @@ -114,7 +114,7 @@ class _AboutPageState extends State { endIndent: 20.w, ), CommonItem( - leftTitel: TranslationLoader.lanKeys!.privacyPolicy!.tr, + leftTitel: '隐私政策'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, @@ -131,8 +131,7 @@ class _AboutPageState extends State { endIndent: 20.w, ), CommonItem( - leftTitel: TranslationLoader - .lanKeys!.personalInformationCollectionList!.tr, + leftTitel: '个人信息收集清单'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, @@ -149,8 +148,7 @@ class _AboutPageState extends State { endIndent: 20.w, ), CommonItem( - leftTitel: - TranslationLoader.lanKeys!.applicationPermissionDescription!.tr, + leftTitel:'应用权限说明'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, @@ -167,8 +165,7 @@ class _AboutPageState extends State { endIndent: 20.w, ), CommonItem( - leftTitel: - TranslationLoader.lanKeys!.thirdPartyInformationSharingList!.tr, + leftTitel:"".tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, diff --git a/lib/mine/addLock/addLock/addLock_page.dart b/lib/mine/addLock/addLock/addLock_page.dart index 09bc1fa6..47652c75 100755 --- a/lib/mine/addLock/addLock/addLock_page.dart +++ b/lib/mine/addLock/addLock/addLock_page.dart @@ -51,7 +51,7 @@ class _AddLockPageState extends State with BaseWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - TranslationLoader.lanKeys!.lightTouchScreen!.tr, + '摸亮触摸屏'.tr, style: TextStyle( fontSize: 24.sp, ), @@ -73,7 +73,7 @@ class _AddLockPageState extends State with BaseWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - TranslationLoader.lanKeys!.lightTouchScreenTip!.tr, + '摸亮触摸屏，锁进入可添加状态，点击下一步'.tr, style: TextStyle( fontSize: 20.sp, fontWeight: FontWeight.w500), ), @@ -85,7 +85,7 @@ class _AddLockPageState extends State with BaseWidget { Container( margin: EdgeInsets.only(left: 20.w, right: 20.w), child: SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, borderRadius: 20.w, onClick: () { logic.getNearByLimits(); diff --git a/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart b/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart index b7112ab4..b15d9f1d 100755 --- a/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart +++ b/lib/mine/addLock/addLockSelectCountry/addLockSelectCountry_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/mine/addLock/addLockSelectCountry/addLockSelectCountry_state.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../appRouters.dart'; @@ -23,8 +24,8 @@ class AddLockSelectCountryPage extends StatefulWidget { } class _AddLockSelectCountryPageState extends State { - final logic = Get.put(AddLockSelectCountryLogic()); - final state = Get.find().state; + final AddLockSelectCountryLogic logic = Get.put(AddLockSelectCountryLogic()); + final AddLockSelectCountryState state = Get.find().state; List countriesList = []; int selectindex = 10000; @@ -35,14 +36,12 @@ class _AddLockSelectCountryPageState extends State { SuspensionUtil.setShowSuspensionStatus( countriesList.cast()); - Future.delayed(const Duration(milliseconds: 20), () { - getCountriesListRequest(); - }); + Future.delayed(const Duration(milliseconds: 20), getCountriesListRequest); } //请求国家/地区json文件 Future getCountriesListRequest() async { - CountryRegionEntity entity = await ApiRepository.to.getCountryRegion('1'); + final CountryRegionEntity entity = await ApiRepository.to.getCountryRegion('1'); countriesList.clear(); if (entity.errorCode!.codeIsSuccessful) { countriesList.addAll(entity.dataList!); @@ -57,8 +56,8 @@ class _AddLockSelectCountryPageState extends State { void _handleList(List list) { if (list.isEmpty) return; for (int i = 0, length = list.length; i < length; i++) { - CountryRegionModel countryModel = list[i]; - String tag = countryModel.group!; + final CountryRegionModel countryModel = list[i]; + final String tag = countryModel.group!; if (RegExp('[A-Z]').hasMatch(tag)) { list[i].tagIndex = tag; } else { @@ -79,8 +78,7 @@ class _AddLockSelectCountryPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( - barTitle: - "请选择您的位置", + barTitle: '请选择您的位置'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), @@ -89,11 +87,11 @@ class _AddLockSelectCountryPageState extends State { Expanded( child: ListView.builder( itemCount: countriesList.length, - itemBuilder: (c, index) { - CountryRegionModel model = countriesList[index]; + itemBuilder: (BuildContext c, int index) { + final CountryRegionModel model = countriesList[index]; return CommonItem( leftTitel: model.name, - rightTitle: "", + rightTitle: '', allHeight: 60.h, isHaveLine: true, isHaveRightWidget: true, @@ -118,40 +116,40 @@ class _AddLockSelectCountryPageState extends State { children: [ TextButton( child: Text( - "跳过", + '跳过', style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { Get.toNamed(Routers.saveLockPage, arguments: { - "addressInfo": {}, - "pwdTimestamp": state.pwdTimestamp.value, - "lockInfo": state.lockInfo, - "featureValue": state.featureValue, - "featureSettingValue": state.featureSettingValue, - "featureSettingParams": state.featureSettingParams, - "isFromMap": 0, + 'addressInfo': {}, + 'pwdTimestamp': state.pwdTimestamp.value, + 'lockInfo': state.lockInfo, + 'featureValue': state.featureValue, + 'featureSettingValue': state.featureSettingValue, + 'featureSettingParams': state.featureSettingParams, + 'isFromMap': 0, }); }, ), TextButton( child: Text( - TranslationLoader.lanKeys!.next!.tr, + '下一步'.tr, style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { if(selectindex == 10000){ - logic.showToast("请选择国家"); + logic.showToast('请选择国家'); return; } - CountryRegionModel model = countriesList[selectindex]; + final CountryRegionModel model = countriesList[selectindex]; Get.toNamed(Routers.saveLockPage, arguments: { - "addressInfo": {"country":model.name}, - "pwdTimestamp": state.pwdTimestamp.value, - "lockInfo": state.lockInfo, - "featureValue": state.featureValue, - "featureSettingValue": state.featureSettingValue, - "featureSettingParams": state.featureSettingParams, - "isFromMap": 0, + 'addressInfo': {'country':model.name}, + 'pwdTimestamp': state.pwdTimestamp.value, + 'lockInfo': state.lockInfo, + 'featureValue': state.featureValue, + 'featureSettingValue': state.featureSettingValue, + 'featureSettingParams': state.featureSettingParams, + 'isFromMap': 0, }); // Navigator.pushNamed(context, Routers.saveLockPage); }, diff --git a/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart b/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart index 4b8a6d28..5d7c9717 100755 --- a/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart +++ b/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart @@ -254,7 +254,7 @@ class _LockAddressGaoDePageState extends State ), TextButton( child: Text( - TranslationLoader.lanKeys!.next!.tr, + '下一步'.tr, style: TextStyle(color: Colors.black, fontSize: 24.sp), ), onPressed: () { diff --git a/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart b/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart index 09b08049..e8ce0c14 100755 --- a/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart +++ b/lib/mine/addLock/lockAddress/lockAddress/lockAddress_page.dart @@ -30,7 +30,7 @@ class _LockAddressPageState extends State with RouteAware{ actionsList: [ TextButton( child: Text( - TranslationLoader.lanKeys!.next!.tr, + '下一步'.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () { diff --git a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index 32d252ca..8e78717a 100755 --- a/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -1,3 +1,4 @@ + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; @@ -5,10 +6,10 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/mine/addLock/nearbyLock/nearbyLock_state.dart'; import '../../../app_settings/app_colors.dart'; import '../../../tools/appRouteObserver.dart'; import '../../../tools/titleAppBar.dart'; -import '../../../translations/trans_lib.dart'; import 'nearbyLock_logic.dart'; class NearbyLockPage extends StatefulWidget { @@ -19,8 +20,8 @@ class NearbyLockPage extends StatefulWidget { } class _NearbyLockPageState extends State with RouteAware { - final logic = Get.put(NearbyLockLogic()); - final state = Get.find().state; + final NearbyLockLogic logic = Get.put(NearbyLockLogic()); + final NearbyLockState state = Get.find().state; @override Widget build(BuildContext context) { @@ -28,10 +29,10 @@ class _NearbyLockPageState extends State with RouteAware { backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr, + barTitle: '附近的锁'.tr, haveBack: true, backgroundColor: AppColors.mainColor, - actionsList: [ + actionsList: [ CupertinoActivityIndicator( radius: 18.w, color: Colors.white, @@ -39,12 +40,12 @@ class _NearbyLockPageState extends State with RouteAware { SizedBox(width: 30.w) ]), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.nearbyLock!.tr, + barTitle: '附近的锁'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, titleColor: AppColors.blackColor, - actionsList: [ + actionsList: [ CupertinoActivityIndicator( radius: 18.w, color: AppColors.blackColor, @@ -52,20 +53,18 @@ class _NearbyLockPageState extends State with RouteAware { SizedBox(width: 30.w) ]), ), - body: Obx(() { - return listView(); - }), + body: Obx(listView), ); } Widget listView() { return Column( crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ Expanded( child: ListView.separated( itemCount: state.devices.length, - itemBuilder: (c, index) { + itemBuilder: (BuildContext c, int index) { return nearbyLockItem('images/icon_lockGroup_item.png', state.devices[index], () { String advName = state.devices[index].advertisementData.advName; state.selectLockName.value = advName; @@ -109,19 +108,19 @@ class _NearbyLockPageState extends State with RouteAware { return GestureDetector( onTap: ((scanResult.advertisementData.serviceUuids.isNotEmpty ? scanResult.advertisementData.serviceUuids[0] - : "") + : '') .toString()[33] == - "1") + '1') ? action : null, child: Column( - children: [ + children: [ Container( height: 89.h, width: 1.sw, color: Colors.white, child: Row( - children: [ + children: [ SizedBox(width: 20.w), Image.asset( lockTypeIcon, @@ -132,7 +131,7 @@ class _NearbyLockPageState extends State with RouteAware { Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, - children: [ + children: [ // 第32、33两位00 表示休眠， 01表示唤醒 Text(scanResult.advertisementData.advName, style: TextStyle( @@ -141,9 +140,9 @@ class _NearbyLockPageState extends State with RouteAware { .isNotEmpty ? scanResult.advertisementData .serviceUuids[0] - : "") + : '') .toString()[33] == - "1") + '1') ? AppColors.blackColor : Colors.grey)), ], @@ -152,7 +151,7 @@ class _NearbyLockPageState extends State with RouteAware { width: 10.w, ), Image.asset( - "images/mine/icon_mine_main_about.png", + 'images/mine/icon_mine_main_about.png', width: 22.w, height: 22.w, ), @@ -237,7 +236,7 @@ class _TipDialog extends StatelessWidget { '固件升级提示'.tr, ), content: Text('请先获取固件文件到手机本地，再选择升级'.tr), - actions: [ + actions: [ TextButton( onPressed: () { Get.back(); @@ -274,7 +273,7 @@ class OTAProgressDialog extends StatelessWidget { '固件升级中'.tr, ), content: Column( - children: [ + children: [ Padding( padding: EdgeInsets.only(top: 20.h, bottom: 10.h), child: Text( @@ -283,7 +282,7 @@ class OTAProgressDialog extends StatelessWidget { ), ), Row( - children: [ + children: [ Text( '传输中'.tr, style: TextStyle(fontSize: 18.sp, color: AppColors.mainColor), @@ -300,7 +299,7 @@ class OTAProgressDialog extends StatelessWidget { ), ], ), - actions: [ + actions: [ TextButton( onPressed: () { logic.closeOTADAta(); diff --git a/lib/mine/addLock/saveLock/saveLock_page.dart b/lib/mine/addLock/saveLock/saveLock_page.dart index ad29c7f1..04ff9cab 100755 --- a/lib/mine/addLock/saveLock/saveLock_page.dart +++ b/lib/mine/addLock/saveLock/saveLock_page.dart @@ -45,10 +45,8 @@ class _SaveLockPageState extends State with RouteAware { children: [ Flexible( child: Text( - TranslationLoader - .lanKeys!.addSuccessfullyPleaseRename!.tr, - style: TextStyle( - fontSize: 24.sp, fontWeight: FontWeight.w500))), + '如需修改名字请重新命名，点击确定添加锁'.tr, + style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w500))), ], ), ), diff --git a/lib/mine/addLock/selectLockType/selectLockType_page.dart b/lib/mine/addLock/selectLockType/selectLockType_page.dart index a64de22d..cb24d17b 100755 --- a/lib/mine/addLock/selectLockType/selectLockType_page.dart +++ b/lib/mine/addLock/selectLockType/selectLockType_page.dart @@ -78,7 +78,7 @@ class _SelectLockTypePageState extends State with BaseWidget //所有的锁类型匹配 List getLockTypeList() { return [ - lockTypeItem('images/lockType/lockType_doorLock.png', TranslationLoader.lanKeys!.doorLock!.tr, () { + lockTypeItem('images/lockType/lockType_doorLock.png', '门锁'.tr, () { CommonDataManage().seletLockType = 1; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 1}); @@ -91,24 +91,24 @@ class _SelectLockTypePageState extends State with BaseWidget }), if (!F.isLite) lockTypeItem('images/lockType/lockType_padlock.png', - TranslationLoader.lanKeys!.padlock!.tr, () { + '挂锁'.tr, () { CommonDataManage().seletLockType = 3; // Navigator.pushNamed(context, Routers.addLockPage); }), lockTypeItem('images/lockType/lockType_safeLock.png', - TranslationLoader.lanKeys!.safeLock!.tr, () { + '保险箱锁'.tr, () { CommonDataManage().seletLockType = 4; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 4}); }), lockTypeItem('images/lockType/lockType_parkingLock.png', - TranslationLoader.lanKeys!.parkingLock!.tr, () { + '车位锁'.tr, () { CommonDataManage().seletLockType = 5; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 5}); }), lockTypeItem('images/lockType/lockType_entranceGuardLock.png', - TranslationLoader.lanKeys!.itelligentAccessControl!.tr, () { + '智能门禁'.tr, () { CommonDataManage().seletLockType = 6; Navigator.pushNamed(context, Routers.addLockPage, arguments: {'getLockType': 6}); @@ -148,11 +148,11 @@ class _SelectLockTypePageState extends State with BaseWidget mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(TranslationLoader.lanKeys!.allLock!.tr, + Text('所有锁'.tr, style: TextStyle( fontSize: 24.sp, )), - Text(TranslationLoader.lanKeys!.searchAllLockType!.tr, + Text('搜索所有锁类型'.tr, style: TextStyle( fontSize: 20.sp, color: AppColors.darkGrayTextColor)), ], diff --git a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart index 16efc235..708897a4 100755 --- a/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart +++ b/lib/mine/gateway/addGateway/gatewayConfigurationWifi/gatewayConfigurationWifi_page.dart @@ -36,7 +36,7 @@ class _GatewayConfigurationWifiPageState extends State[ CommonItem( - leftTitel: TranslationLoader.lanKeys!.wifiName!.tr, + leftTitel: 'WiFi名称'.tr, rightTitle: 'XinHongJia', allHeight: 100.h, isHaveLine: true, @@ -53,27 +53,26 @@ class _GatewayConfigurationWifiPageState extends State[ CommonItem( - leftTitel: TranslationLoader.lanKeys!.ipAddress!.tr, + leftTitel: 'IP地址'.tr, rightTitle: '192.168.1.1', allHeight: 100.h, isHaveLine: true), CommonItem( - leftTitel: - TranslationLoader.lanKeys!.subnetMask!.tr, + leftTitel: '子网掩码'.tr, rightTitle: '255.255.255.0', allHeight: 100.h, isHaveLine: true), CommonItem( - leftTitel: - TranslationLoader.lanKeys!.defaultGateway!.tr, + leftTitel: '默认网关'.tr, rightTitle: '192.168.1.1', allHeight: 100.h, isHaveLine: true), @@ -105,8 +102,7 @@ class _GatewayConfigurationWifiPageState extends State[ CommonItem( - leftTitel: TranslationLoader - .lanKeys!.preferredDNS!.tr, + leftTitel: '首选DNS'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, @@ -126,8 +121,7 @@ class _GatewayConfigurationWifiPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.selectGateway!.tr, + barTitle: '选择网关'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView.builder( @@ -28,8 +28,8 @@ class _SelectGatewayListPageState extends State { itemBuilder: (c, index) { return _selectGatewayListListItem( 'images/mine/icon_mine_gatewayListMainIcon.png', - "G2 41c21c", - "-34", () { + 'G2 41c21c', + '-34', () { Navigator.pushNamed( context, Routers.gatewayConfigurationWifiPage); }); diff --git a/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart b/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart index c8b9a5dc..e1eb90fa 100755 --- a/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart +++ b/lib/mine/gateway/addGateway/selectGatewayType/selectGatewayType_page.dart @@ -20,7 +20,7 @@ class _SelectGatewayTypePageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.selectGatewayType!.tr, + barTitle: '选择网关类型'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( diff --git a/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart b/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart index 20571a19..12dc97c9 100755 --- a/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart +++ b/lib/mine/gateway/addGateway/selectGatewayTypeNextTip/selectGatewayTypeNextTip_page.dart @@ -23,7 +23,7 @@ class _SelectGatewayTypeNextTipPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.addGateway!.tr, + barTitle: '添加网关'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( @@ -31,7 +31,7 @@ class _SelectGatewayTypeNextTipPageState SizedBox(height: 40.h), Center( child: Text( - TranslationLoader.lanKeys!.turnThePowerBackOn!.tr, + '重新通电'.tr, style: TextStyle(fontSize: 24.sp), )), SizedBox(height: 80.h), @@ -42,10 +42,10 @@ class _SelectGatewayTypeNextTipPageState bottom: 50.h, left: 120.w, child: Text( - TranslationLoader.lanKeys!.indicatorLight!.tr, + '指示灯'.tr, style: TextStyle(fontSize: 20.sp), )), - Image.asset("images/mine/icon_mine_selectGatewayType_next.png", + Image.asset('images/mine/icon_mine_selectGatewayType_next.png', width: 220.w, height: 220.w), ], ), @@ -54,7 +54,7 @@ class _SelectGatewayTypeNextTipPageState padding: EdgeInsets.all(20.w), child: Center( child: Text( - TranslationLoader.lanKeys!.selectGatewayTypeNextTip!.tr, + '将网关重新通电，指示灯交替闪烁时点击下一步'.tr, textAlign: TextAlign.center, style: TextStyle(fontSize: 18.sp), ))), @@ -62,7 +62,7 @@ class _SelectGatewayTypeNextTipPageState Container( padding: EdgeInsets.only(left: 20.w, right: 20.w), child: SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, onClick: () { Navigator.pushNamed(context, Routers.selectGatewayPage); }), diff --git a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart index 639b9bf5..8a223882 100755 --- a/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart +++ b/lib/mine/gateway/gatewayConnectionLock/gatewayConnectionLockList_page.dart @@ -27,13 +27,13 @@ class _GatewayConnectionLockListPageState extends State { - final _changeGatewayNameController = TextEditingController(); + final TextEditingController _changeGatewayNameController = TextEditingController(); @override Widget build(BuildContext context) { @@ -29,9 +29,9 @@ class _GatewayDetailPageState extends State { haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( - children: [ + children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.designation!.tr, + leftTitel: '名称'.tr, rightTitle: '星锁网关', isHaveLine: true, isHaveDirection: true, @@ -39,17 +39,17 @@ class _GatewayDetailPageState extends State { showCupertinoAlertDialog(context); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.state!.tr, + leftTitel: '状态'.tr, rightTitle: '在线', isHaveLine: true, isHaveDirection: false), CommonItem( - leftTitel: TranslationLoader.lanKeys!.wifiName!.tr, + leftTitel: 'WiFi名称'.tr, rightTitle: 'XinHongJia', isHaveLine: true, isHaveDirection: false), CommonItem( - leftTitel: TranslationLoader.lanKeys!.networkMAC!.tr, + leftTitel: '网络MAC'.tr, rightTitle: '39:23:df:34:12', isHaveLine: false, isHaveDirection: false), @@ -57,7 +57,7 @@ class _GatewayDetailPageState extends State { height: 10.h, ), CommonItem( - leftTitel: TranslationLoader.lanKeys!.nearbyLock!.tr, + leftTitel: '附近的锁'.tr, rightTitle: '2', isHaveLine: true, isHaveDirection: true, @@ -65,7 +65,7 @@ class _GatewayDetailPageState extends State { Navigator.pushNamed(context, Routers.gatewayConnectionLockPage); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.gatewayUpgrade!.tr, + leftTitel: '网关升级'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, diff --git a/lib/mine/mine/safeVerify/safeVerify_state.dart b/lib/mine/mine/safeVerify/safeVerify_state.dart index 894d2cc4..f9d1de3c 100755 --- a/lib/mine/mine/safeVerify/safeVerify_state.dart +++ b/lib/mine/mine/safeVerify/safeVerify_state.dart @@ -4,42 +4,42 @@ import 'package:star_lock/login/login/entity/LoginData.dart'; import 'package:star_lock/translations/trans_lib.dart'; class SafeVerifyState { + + SafeVerifyState() { + resetResend(); + } final TextEditingController codeController = TextEditingController(); static int currentTimeMillis() { return DateTime.now().millisecondsSinceEpoch; } - var countryCode = '+86'.obs; - var countryId = '9'.obs; - var codeType = '5'.obs; // //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） - var verificationCode = ''.obs; - var xWidth = ''.obs; // 滑动验证码滑动位置 - var canSub = false.obs; - var date = currentTimeMillis().toString().obs; - var accountStr = ''.obs; - var toggleStr = ''.obs; //可切换字眼 - var isToggle = false.obs; //是否点击切换 - var channel = '1'.obs; //短信通道 1 短信，2 邮箱 + RxString countryCode = '+86'.obs; + RxString countryId = '9'.obs; + RxString codeType = '5'.obs; // //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） + RxString verificationCode = ''.obs; + RxString xWidth = ''.obs; // 滑动验证码滑动位置 + RxBool canSub = false.obs; + RxString date = currentTimeMillis().toString().obs; + RxString accountStr = ''.obs; + RxString toggleStr = ''.obs; //可切换字眼 + RxBool isToggle = false.obs; //是否点击切换 + RxString channel = '1'.obs; //短信通道 1 短信，2 邮箱 bool get codeIsOK => verificationCode.value.isNotEmpty; - var canResend = false.obs; - var btnText = ''.obs; - var totalSeconds = 120; - var currentSecond = 120; + RxBool canResend = false.obs; + RxString btnText = ''.obs; + int totalSeconds = 120; + int currentSecond = 120; - final loginData = LoginData().obs; - - SafeVerifyState() { - resetResend(); - } + final Rx loginData = LoginData().obs; void resetResend() { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() {} diff --git a/lib/mine/mine/starLockMine_page.dart b/lib/mine/mine/starLockMine_page.dart index 9f387eab..822fef42 100755 --- a/lib/mine/mine/starLockMine_page.dart +++ b/lib/mine/mine/starLockMine_page.dart @@ -183,7 +183,7 @@ class StarLockMinePageState extends State with BaseWidget { // Navigator.pushNamed(context, Routers.supportStaffPage); // }), mineItem('images/mine/icon_mine_main_set.png', - TranslationLoader.lanKeys!.set!.tr, () { + '设置'.tr, () { Get.back(); Get.toNamed(Routers.mineSetPage); }), @@ -191,8 +191,7 @@ class StarLockMinePageState extends State with BaseWidget { if (F.isLite) Container() else - mineItem('images/mine/icon_mine_main_vip.png', - TranslationLoader.lanKeys!.valueAddedServices!.tr, () { + mineItem('images/mine/icon_mine_main_vip.png', '增值服务'.tr, () { Get.back(); Get.toNamed(Routers.valueAddedServicesPage); }), @@ -206,12 +205,11 @@ class StarLockMinePageState extends State with BaseWidget { }), if (F.isSKY) mineItem('images/mine/icon_mine_main_shoppingcart.png', - TranslationLoader.lanKeys!.supportStaff!.tr, () { + '客服'.tr, () { Get.back(); CustomerTool.openCustomerService(); }), - mineItem('images/mine/icon_mine_main_about.png', - TranslationLoader.lanKeys!.about!.tr, () { + mineItem('images/mine/icon_mine_main_about.png', '关于'.tr, () { Get.back(); Get.toNamed(Routers.aboutPage); }), @@ -224,7 +222,7 @@ class StarLockMinePageState extends State with BaseWidget { return Column( children: [ SubmitBtn( - btnName: TranslationLoader.lanKeys!.logout!.tr, + btnName: '退出'.tr, borderRadius: 20.w, fontSize: 32.sp, margin: EdgeInsets.only(left: 60.w, right: 60.w), @@ -238,7 +236,7 @@ class StarLockMinePageState extends State with BaseWidget { children: [ TextButton( child: Text( - TranslationLoader.lanKeys!.deleteAccount!.tr, + '删除账号'.tr, style: TextStyle( color: AppColors.mainColor, fontWeight: FontWeight.w500), ), diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart index ed736c82..b79a4c6a 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_logic.dart'; +import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_state.dart'; import 'package:star_lock/tools/tf_input_haveBorder.dart'; import '../../../../appRouters.dart'; @@ -15,13 +16,12 @@ class MineUnbindPhoneOrEmailPage extends StatefulWidget { const MineUnbindPhoneOrEmailPage({Key? key}) : super(key: key); @override - State createState() => - _MineUnbindPhoneOrEmailState(); + State createState() => _MineUnbindPhoneOrEmailState(); } class _MineUnbindPhoneOrEmailState extends State { - final logic = Get.put(MineUnbindPhoneOrEmailLogic()); - final state = Get.find().state; + final MineUnbindPhoneOrEmailLogic logic = Get.put(MineUnbindPhoneOrEmailLogic()); + final MineUnbindPhoneOrEmailState state = Get.find().state; @override Widget build(BuildContext context) { @@ -29,12 +29,12 @@ class _MineUnbindPhoneOrEmailState extends State { backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, + barTitle: '修改账号'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, + barTitle: '修改账号'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -42,13 +42,13 @@ class _MineUnbindPhoneOrEmailState extends State { ), ), body: Column( - children: [ + children: [ Container( width: 1.sw, color: AppColors.greyBackgroundColor, padding: EdgeInsets.only(left: 15.w, top: 10.h, bottom: 10.h), child: Text( - TranslationLoader.lanKeys!.modifyAccountTip!.tr, + '为了你的账号安全，修改账号前请先使用验证码验证'.tr, style: TextStyle(fontSize: 20.sp), )), Obx(() => Container( @@ -79,7 +79,7 @@ class _MineUnbindPhoneOrEmailState extends State { )))), SizedBox(height: 50.w), Obx(() => SubmitBtn( - btnName: TranslationLoader.lanKeys!.next!.tr, + btnName: '下一步'.tr, isDisabled: state.canSub.value, onClick: () { if (state.channel.value == '1') { @@ -91,7 +91,7 @@ class _MineUnbindPhoneOrEmailState extends State { SizedBox(height: 50.w), Row( mainAxisAlignment: MainAxisAlignment.end, - children: [ + children: [ GestureDetector( child: SizedBox( // width: 150.w, @@ -99,7 +99,7 @@ class _MineUnbindPhoneOrEmailState extends State { // color: Colors.red, child: Center( child: Text( - '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + '${'忘记密码'.tr}？', style: TextStyle( fontSize: 18.sp, color: AppColors.mainColor)), ), diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_state.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_state.dart index 2a03136b..5cc9f324 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_state.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccount/mineUnbindPhoneOrEmail_state.dart @@ -3,34 +3,11 @@ import 'package:get/get.dart'; import 'package:star_lock/translations/trans_lib.dart'; class MineUnbindPhoneOrEmailState { - final TextEditingController codeController = TextEditingController(); - - static int currentTimeMillis() { - return DateTime.now().millisecondsSinceEpoch; - } - - var countryCode = ''.obs; - var codeType = '4'.obs; //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） - var channel = '1'.obs; //短信通道 1 短信，2 邮箱 - var unbindToken = ''.obs; //解绑Token - var uniqueid = 'B748F838-94EE-4BDB-A0E6-7B2D16849792'.obs; - var mobileOrEmailStr = ''.obs; - var verificationCode = ''.obs; - var xWidth = ''.obs; // 滑动验证码滑动位置 - var canSub = false.obs; - var date = currentTimeMillis().toString().obs; - - bool get codeIsOK => verificationCode.value.isNotEmpty; - - var canResend = false.obs; - var btnText = ''.obs; - var totalSeconds = 120; - var currentSecond = 120; MineUnbindPhoneOrEmailState() { Map map = Get.arguments; - channel.value = map["isFrom"]; - if (channel.value == "1") { + channel.value = map['isFrom']; + if (channel.value == '1') { mobileOrEmailStr.value = map['mobile']; codeType.value = '4'; } else { @@ -40,12 +17,35 @@ class MineUnbindPhoneOrEmailState { resetResend(); } + final TextEditingController codeController = TextEditingController(); + + static int currentTimeMillis() { + return DateTime.now().millisecondsSinceEpoch; + } + + RxString countryCode = ''.obs; + RxString codeType = '4'.obs; //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） + RxString channel = '1'.obs; //短信通道 1 短信，2 邮箱 + RxString unbindToken = ''.obs; //解绑Token + RxString uniqueid = 'B748F838-94EE-4BDB-A0E6-7B2D16849792'.obs; + RxString mobileOrEmailStr = ''.obs; + RxString verificationCode = ''.obs; + RxString xWidth = ''.obs; // 滑动验证码滑动位置 + RxBool canSub = false.obs; + RxString date = currentTimeMillis().toString().obs; + + bool get codeIsOK => verificationCode.value.isNotEmpty; + + RxBool canResend = false.obs; + RxString btnText = ''.obs; + int totalSeconds = 120; + int currentSecond = 120; void resetResend() { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() {} diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart index 8dabf109..08500468 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_logic.dart'; +import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart'; import '../../../../app_settings/app_colors.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/tf_input_haveBorder.dart'; @@ -17,10 +18,9 @@ class MinePersonInfoEditAccountNextPage extends StatefulWidget { _MinePersonInfoEditAccountNextPageState(); } -class _MinePersonInfoEditAccountNextPageState - extends State { - final logic = Get.put(PersonInfoEditAccountLogic()); - final state = Get.find().state; +class _MinePersonInfoEditAccountNextPageState extends State { + final PersonInfoEditAccountLogic logic = Get.put(PersonInfoEditAccountLogic()); + final PersonInfoEditAccountState state = Get.find().state; @override Widget build(BuildContext context) { @@ -28,12 +28,12 @@ class _MinePersonInfoEditAccountNextPageState backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, + barTitle: '修改账号'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.modifyAccount!.tr, + barTitle: '修改账号'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -41,13 +41,13 @@ class _MinePersonInfoEditAccountNextPageState ), ), body: Column( - children: [ + children: [ Container( width: 1.sw, // color: Colors.grey, padding: EdgeInsets.only(left: 30.w, top: 15.h, bottom: 15.h), child: Text( - TranslationLoader.lanKeys!.pleaseEnterNewAccountNumber!.tr, + '请输入新账号'.tr, style: TextStyle(fontWeight: FontWeight.w600, fontSize: 24.sp), )), @@ -79,7 +79,7 @@ class _MinePersonInfoEditAccountNextPageState // ), child: Center( child: Text( - '${"获取".tr}${TranslationLoader.lanKeys!.verificationCode!.tr}', + '获取验证码'.tr, textAlign: TextAlign.center, style: TextStyle( color: Colors.grey, diff --git a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart index 9821c692..0a33f970 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditAccount/minePersonInfoEditAccountNext/minePersonInfoEditAccountNext_state.dart @@ -13,26 +13,26 @@ class PersonInfoEditAccountState { return DateTime.now().millisecondsSinceEpoch; } - var countryCode = '+86'.obs; - var countryId = '9'.obs; - var codeType = '3'.obs; ////1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） - var channel = '1'.obs; //短信通道 1 短信，2 邮箱 - var uniqueid = 'B748F838-94EE-4BDB-A0E6-7B2D16849792'.obs; - var newAccountStr = ''.obs; - var verificationCode = ''.obs; - var xWidth = ''.obs; // 滑动验证码滑动位置 - var canSub = false.obs; - var date = currentTimeMillis().toString().obs; + RxString countryCode = '+86'.obs; + RxString countryId = '9'.obs; + RxString codeType = '3'.obs; ////1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） + RxString channel = '1'.obs; //短信通道 1 短信，2 邮箱 + RxString uniqueid = 'B748F838-94EE-4BDB-A0E6-7B2D16849792'.obs; + RxString newAccountStr = ''.obs; + RxString verificationCode = ''.obs; + RxString xWidth = ''.obs; // 滑动验证码滑动位置 + RxBool canSub = false.obs; + RxString date = currentTimeMillis().toString().obs; bool get accountIsOK => newAccountStr.value.isNotEmpty; bool get codeIsOK => verificationCode.value.isNotEmpty; - var canResend = false.obs; - var btnText = ''.obs; - var totalSeconds = 120; - var currentSecond = 120; + RxBool canResend = false.obs; + RxString btnText = ''.obs; + int totalSeconds = 120; + int currentSecond = 120; - final loginData = LoginData().obs; + final Rx loginData = LoginData().obs; ///本地存储 登录信息 void saveLoginData(LoginData? data) async { @@ -42,7 +42,7 @@ class PersonInfoEditAccountState { ///初始化本地数据 void initLoginData() async { - final data = await Storage.getString(saveUserLoginData); + final String? data = await Storage.getString(saveUserLoginData); if (data != null && data.isNotEmpty) { loginData.value = LoginData.fromJson(jsonDecode(data)); } @@ -64,7 +64,7 @@ class PersonInfoEditAccountState { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() {} diff --git a/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart index a3d88782..a2348ef1 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditIphone/minePersonInfoEditIphone_page.dart @@ -19,19 +19,17 @@ class MinePersonInfoEditIphonePage extends StatefulWidget { _MinePersonInfoEditIphonePageState(); } -class _MinePersonInfoEditIphonePageState - extends State { +class _MinePersonInfoEditIphonePageState extends State { final TextEditingController _phoneController = TextEditingController(); final TextEditingController _codeController = TextEditingController(); - late Timer _timer; - int _seconds = 60; + final int _seconds = 60; @override Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.iphone!.tr, + barTitle: '手机'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Container( @@ -42,7 +40,7 @@ class _MinePersonInfoEditIphonePageState width: 1.sw, padding: EdgeInsets.only(top: 5.h, bottom: 5.h), child: Text( - TranslationLoader.lanKeys!.changeIphoneTip!.tr, + '找回密码和登录新设备时，可通过绑定的手机验证'.tr, style: TextStyle(fontSize: 20.sp), )), GestureDetector( @@ -58,7 +56,7 @@ class _MinePersonInfoEditIphonePageState SizedBox(width: 5.w), Expanded( child: Text( - TranslationLoader.lanKeys!.countryAndRegion!.tr, + '国家/地区'.tr, style: TextStyle( fontSize: 22.sp, fontWeight: FontWeight.w500))), @@ -126,7 +124,7 @@ class _MinePersonInfoEditIphonePageState child: Center( child: Text( _seconds == 60 - ? '${"获取".tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}' + ? '获取验证码'.tr : (_seconds < 10) ? '0$_seconds s' : '$_seconds s', diff --git a/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart b/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart index 17a0031d..407533fa 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditName/MinePersonInfoEditName_logic.dart'; +import 'package:star_lock/mine/minePersonInfo/minePersonInfoEditName/minePersonInfoEditName_state.dart'; import '../../../app_settings/app_colors.dart'; import '../../../tools/tf_loginInput.dart'; @@ -18,10 +19,9 @@ class MinePersonInfoEditNamePage extends StatefulWidget { _MinePersonInfoEditNamePageState(); } -class _MinePersonInfoEditNamePageState - extends State { - final logic = Get.put(MinePersonInfoEditNameLogic()); - final state = Get.find().state; +class _MinePersonInfoEditNamePageState extends State { + final MinePersonInfoEditNameLogic logic = Get.put(MinePersonInfoEditNameLogic()); + final MinePersonInfoEditNamePageState state = Get.find().state; @override Widget build(BuildContext context) { @@ -29,10 +29,10 @@ class _MinePersonInfoEditNamePageState backgroundColor: AppColors.greyBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.changeNickName!.tr, + barTitle: '修改昵称'.tr, haveBack: true, backgroundColor: AppColors.mainColor, - actionsList: [ + actionsList: [ TextButton( child: Text( '保存'.tr, @@ -49,12 +49,12 @@ class _MinePersonInfoEditNamePageState ], ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.changeNickName!.tr, + barTitle: '修改昵称'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, titleColor: AppColors.blackColor, - actionsList: [ + actionsList: [ TextButton( child: Text( '保存'.tr, @@ -81,7 +81,7 @@ class _MinePersonInfoEditNamePageState Widget listView() { Widget view = Column( mainAxisSize: MainAxisSize.min, - children: [ + children: [ LoginInput( controller: state.nickNameController, onchangeAction: (textStr) { @@ -90,8 +90,8 @@ class _MinePersonInfoEditNamePageState isPwd: false, leftWidget: SizedBox(width: 15.w), hintText: - "${'请输入'.tr}${TranslationLoader.lanKeys!.nickName!.tr}", - inputFormatters: [ + '请输入昵称'.tr, + inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), ], diff --git a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart index 22f156d3..17608c0b 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_page.dart @@ -34,15 +34,15 @@ class _MineBindPhoneOrEmailPageState extends State { appBar: F.sw( skyCall: () => TitleAppBar( barTitle: state.channel.value == '1' - ? TranslationLoader.lanKeys!.mobileNumber!.tr - : TranslationLoader.lanKeys!.email!.tr, + ? '手机号'.tr + : '邮箱'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( barTitle: state.channel.value == '1' - ? TranslationLoader.lanKeys!.mobileNumber!.tr - : TranslationLoader.lanKeys!.email!.tr, + ? '手机号'.tr + : '邮箱'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -59,12 +59,12 @@ class _MineBindPhoneOrEmailPageState extends State { padding: EdgeInsets.only(top: 5.h, bottom: 5.h), child: Text( state.channel.value == '1' - ? TranslationLoader.lanKeys!.changeIphoneTip!.tr - : TranslationLoader.lanKeys!.changeEmailTip!.tr, + ? '找回密码和登录新设备时，可通过绑定的手机验证'.tr + : '找回密码和登录新设备时，可通过绑定的邮箱验证'.tr, style: TextStyle(fontSize: 20.sp), )), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isPadding: false, @@ -94,8 +94,8 @@ class _MineBindPhoneOrEmailPageState extends State { }, leftWidget: const SizedBox(), hintText: state.channel.value == '1' - ? '${'请输入'.tr}${TranslationLoader.lanKeys!.mobileNumber!.tr}' - : '${'请输入'.tr}${TranslationLoader.lanKeys!.email!.tr}', + ? '请输入手机号'.tr + : '请输入邮箱'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -111,7 +111,7 @@ class _MineBindPhoneOrEmailPageState extends State { logic.checkNext(state.codeController); }, hintText: - '${'请输入'.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}', + '请输入验证码'.tr, inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), diff --git a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_state.dart b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_state.dart index c6619187..db0a9ab0 100755 --- a/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_state.dart +++ b/lib/mine/minePersonInfo/minePersonInfoEmail/mineBindPhoneOrEmail_state.dart @@ -10,39 +10,39 @@ class MineBindPhoneOrEmailState { return DateTime.now().millisecondsSinceEpoch; } - var countryCode = '86'.obs; - var countryName = '中国'.obs; + RxString countryCode = '86'.obs; + RxString countryName = '中国'.obs; - var countryId = '9'.obs; - var codeType = '4'.obs; //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） - var channel = '1'.obs; //短信通道 1 短信，2 邮箱 - var verificationCode = ''.obs; - var xWidth = ''.obs; // 滑动验证码滑动位置 - var canSub = false.obs; - var date = currentTimeMillis().toString().obs; - var inputAccount = ''.obs; //新账号 - var unbindToken = ''.obs; //解绑的Token + RxString countryId = '9'.obs; + RxString codeType = '4'.obs; //1注册，2找回密码，3绑定手机号，4解绑手机（换绑），5删除账号，6 绑定邮箱，7解绑邮箱（换绑） + RxString channel = '1'.obs; //短信通道 1 短信，2 邮箱 + RxString verificationCode = ''.obs; + RxString xWidth = ''.obs; // 滑动验证码滑动位置 + RxBool canSub = false.obs; + RxString date = currentTimeMillis().toString().obs; + RxString inputAccount = ''.obs; //新账号 + RxString unbindToken = ''.obs; //解绑的Token - var accountIsOK = false.obs; + RxBool accountIsOK = false.obs; bool get codeIsOK => verificationCode.value.isNotEmpty; - var canResend = false.obs; - var btnText = ''.obs; - var totalSeconds = 120; - var currentSecond = 120; + RxBool canResend = false.obs; + RxString btnText = ''.obs; + int totalSeconds = 120; + int currentSecond = 120; MineBindPhoneOrEmailState() { Map map = Get.arguments; - if (map["unbindToken"] != null) { - unbindToken.value = map["unbindToken"]; + if (map['unbindToken'] != null) { + unbindToken.value = map['unbindToken']; } - channel.value = map["isFrom"]; + channel.value = map['isFrom']; //短信通道 1 短信，2 邮箱 //短信类型 1注册，2找回密码，3绑定手机号，4解绑（换绑），5删除账号，6 绑定邮箱 - if (channel.value == "1") { - codeType.value = "3"; + if (channel.value == '1') { + codeType.value = '3'; } else { - codeType.value = "6"; + codeType.value = '6'; } resetResend(); @@ -52,7 +52,7 @@ class MineBindPhoneOrEmailState { canResend.value = totalSeconds == currentSecond; btnText.value = !canResend.value ? '$currentSecond s' - : btnText.value = TranslationLoader.lanKeys!.getVerificationCode!.tr; + : btnText.value = '获取验证码'.tr; } void onClose() {} diff --git a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart index da6afb8c..166d2f53 100755 --- a/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart @@ -35,7 +35,7 @@ class _MinePersonInfoPageState extends State { skyCall: () => AppColors.mainBackgroundColor, xhjCall: () => AppColors.mainBackgroundColor), appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.personalInformation!.tr, + barTitle: '个人信息'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -50,7 +50,7 @@ class _MinePersonInfoPageState extends State { child: Column( children: [ Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.avatar!.tr, + leftTitel: '头像'.tr, rightTitle: '', allHeight: 100.h, isHaveLine: true, @@ -69,7 +69,7 @@ class _MinePersonInfoPageState extends State { }, )), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.nickName!.tr, + leftTitel: '昵称'.tr, rightTitle: state.mineInfoData.value.nickname != null ? state.mineInfoData.value.nickname! : '', @@ -83,7 +83,7 @@ class _MinePersonInfoPageState extends State { }).then((Object? value) => logic.getUserInfoRequest()); })), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.mobileNumber!.tr, + leftTitel: '手机号'.tr, // rightTitle: (state.mineInfoData.value.mobile ?? '').isNotEmpty // ? state.mineInfoData.value.mobile! // : TranslationLoader.lanKeys!.goBind!.tr, @@ -135,7 +135,7 @@ class _MinePersonInfoPageState extends State { } })), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.email!.tr, + leftTitel: '邮箱'.tr, // rightTitle: (state.mineInfoData.value.email??'').isNotEmpty // ? state.mineInfoData.value.email! // : TranslationLoader.lanKeys!.goBind!.tr, @@ -188,7 +188,7 @@ class _MinePersonInfoPageState extends State { context, Routers.minePersonInfoResetPasswordPage); }), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.safetyProblem!.tr, + leftTitel: '安全问题'.tr, isHaveRightWidget: true, // rightTitle: state.mineInfoData.value.haveSafeAnswer == 0 // ? '去设置'.tr @@ -216,8 +216,7 @@ class _MinePersonInfoPageState extends State { } })), Obx(() => CommonItem( - leftTitel: - TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: state.mineInfoData.value.countryName != null ? state.mineInfoData.value.countryName! : '', diff --git a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart index b97cab16..55325860 100755 --- a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart @@ -32,12 +32,12 @@ class _MinePersonInfoResetPasswordPageState backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.resetPasswords!.tr, + barTitle: '重置密码'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.resetPasswords!.tr, + barTitle: '重置密码'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -70,7 +70,7 @@ class _MinePersonInfoResetPasswordPageState // color: Colors.red, child: Center( child: Text( - '${TranslationLoader.lanKeys!.forgetPassword!.tr}？', + '${'忘记密码'.tr}？', style: TextStyle( color: AppColors.mainColor, fontSize: 18.sp)), ), @@ -96,7 +96,7 @@ class _MinePersonInfoResetPasswordPageState }, isPwd: true, leftWidget: Text( - '${TranslationLoader.lanKeys!.originalPassword!.tr} ', + '${'原密码'.tr} ', style: TextStyle(fontSize: 22.sp), ), hintText: '', @@ -110,7 +110,7 @@ class _MinePersonInfoResetPasswordPageState }, isPwd: true, leftWidget: Text( - '${TranslationLoader.lanKeys!.newPassword!.tr} ', + '${'新密码'.tr} ', style: TextStyle(fontSize: 22.sp), ), hintText: '', @@ -125,7 +125,7 @@ class _MinePersonInfoResetPasswordPageState isPwd: true, // isHaveLeftWidget: false, leftWidget: Text( - '${TranslationLoader.lanKeys!.surePassword!.tr} ', + '${'确认密码'.tr} ', style: TextStyle(fontSize: 22.sp), ), hintText: '', @@ -135,7 +135,7 @@ class _MinePersonInfoResetPasswordPageState Container( width: 1.sw, padding: EdgeInsets.only(top: 15.h, bottom: 10.h), - child: Text(TranslationLoader.lanKeys!.registerPasswordTip!.tr, + child: Text('密码必须是8-20位，至少包括数字/字母/符号中的2种'.tr, style: TextStyle( fontSize: 18.w, color: AppColors.darkGrayTextColor))), ], diff --git a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_logic.dart b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_logic.dart index a00bcbb2..1a9051a9 100755 --- a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_logic.dart +++ b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_logic.dart @@ -12,8 +12,8 @@ class MineSetSafetyProblemLogic extends BaseGetXController { final MineSetSafetyProblemState state = MineSetSafetyProblemState(); //用户信息 Future getQuestionListRequest() async { - var entity = - await ApiRepository.to.getQuestionList("", state.countryCode.value); + final entity = + await ApiRepository.to.getQuestionList('', state.countryCode.value); if (entity.errorCode!.codeIsSuccessful) { state.firstProblemList.value = entity.data!.firstList!; state.secondProblemList.value = entity.data!.secondList!; @@ -24,10 +24,10 @@ class MineSetSafetyProblemLogic extends BaseGetXController { //设置安全信息 Future setSafeAnswerRequest() async { getRequestAnswerList(); - var entity = + final entity = await ApiRepository.to.setSafeAnswer(state.questionAndAnswerList.value); if (entity.errorCode!.codeIsSuccessful) { - showToast("操作成功"); + showToast('操作成功'.tr); Get.until((route) => route.settings.name == Routers.minePersonInfoPage); } } @@ -35,10 +35,10 @@ class MineSetSafetyProblemLogic extends BaseGetXController { //修改安全信息 Future updateSafeAnswerRequest() async { getRequestAnswerList(); - var entity = await ApiRepository.to + final entity = await ApiRepository.to .updateSafeAnswer(state.questionAndAnswerList.value); if (entity.errorCode!.codeIsSuccessful) { - showToast("操作成功"); + showToast('操作成功'.tr); Get.until((route) => route.settings.name == Routers.minePersonInfoPage); } } @@ -47,7 +47,7 @@ class MineSetSafetyProblemLogic extends BaseGetXController { state.questionAndAnswerList.value.clear(); for (int i = 0; i < 3; i++) { if (i == 0) { - SafetyProblemData data = SafetyProblemData(); + final SafetyProblemData data = SafetyProblemData(); data.question = state.firstProblemStr.value; data.answer = state.firstAnswerStr.value; data.questionId = state.firstQuestionId.value; @@ -56,7 +56,7 @@ class MineSetSafetyProblemLogic extends BaseGetXController { } state.questionAndAnswerList.value.add(data); } else if (i == 1) { - SafetyProblemData data = SafetyProblemData(); + final SafetyProblemData data = SafetyProblemData(); data.question = state.secondProblemStr.value; data.answer = state.secondAnswerStr.value; data.questionId = state.secondQuestionId.value; @@ -65,7 +65,7 @@ class MineSetSafetyProblemLogic extends BaseGetXController { } state.questionAndAnswerList.value.add(data); } else if (i == 2) { - SafetyProblemData data = SafetyProblemData(); + final SafetyProblemData data = SafetyProblemData(); data.question = state.thirdProblemStr.value; data.answer = state.thirdAnswerStr.value; data.questionId = state.thirdQuestionId.value; @@ -96,12 +96,9 @@ class MineSetSafetyProblemLogic extends BaseGetXController { void _resetCanSub() { state.canSub.value = state.answerIsOK && - state.firstProblemStr.value != - TranslationLoader.lanKeys!.problemOne!.tr && - state.secondProblemStr.value != - TranslationLoader.lanKeys!.problemTwo!.tr && - state.thirdProblemStr.value != - TranslationLoader.lanKeys!.problemThree!.tr; + state.firstProblemStr.value != '问题一'.tr && + state.secondProblemStr.value != '问题二'.tr && + state.thirdProblemStr.value != '问题三'.tr; } @override diff --git a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart index 576c34cd..f4e30e0f 100755 --- a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_page.dart @@ -38,12 +38,12 @@ class _MinePersonInfoSetSafetyProblemPageState backgroundColor: AppColors.mainBackgroundColor, appBar: F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr, + barTitle: '安全问题'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr, + barTitle: '安全问题'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -57,7 +57,7 @@ class _MinePersonInfoSetSafetyProblemPageState color: AppColors.greyBackgroundColor, padding: EdgeInsets.all(20.h), child: Text( - TranslationLoader.lanKeys!.safetyProblemTip!.tr, + '当你手机丢了，可以通过回答设置的安全问题来登录新设备'.tr, style: TextStyle(fontSize: 18.sp), )), Obx(() => _safityProblemItem( @@ -108,7 +108,7 @@ class _MinePersonInfoSetSafetyProblemPageState children: [ CommonItem( leftTitel: problemTitle, - rightTitle: "", + rightTitle: '', isHaveLine: true, isHaveDirection: true, action: action), @@ -127,7 +127,7 @@ class _MinePersonInfoSetSafetyProblemPageState //输入里面输入文字内边距设置 // contentPadding: const EdgeInsets.only(top: 8.0, left: -19.0, right: -15.0, bottom: 8.0), // labelText: label, - hintText: TranslationLoader.lanKeys!.pleaseEnterYourAnswer!.tr, + hintText: '请输入你的答案'.tr, //不需要输入框下划线 border: InputBorder.none, hintStyle: TextStyle(fontSize: 22.sp)), diff --git a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_state.dart b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_state.dart index 97b0c11d..dd6aef3a 100755 --- a/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_state.dart +++ b/lib/mine/minePersonInfo/minePersonInfoSetSafetyProblem/minePersonInfoSetSafetyProblem_state.dart @@ -7,52 +7,52 @@ class MineSetSafetyProblemState { final TextEditingController secondAnswerController = TextEditingController(); final TextEditingController thirdAnswerController = TextEditingController(); - var firstProblemList = [].obs; - var secondProblemList = [].obs; - var thirdProblemList = [].obs; + RxList firstProblemList = [].obs; + RxList secondProblemList = [].obs; + RxList thirdProblemList = [].obs; - var firstProblemStr = TranslationLoader.lanKeys!.problemOne!.tr.obs; - var secondProblemStr = TranslationLoader.lanKeys!.problemTwo!.tr.obs; - var thirdProblemStr = TranslationLoader.lanKeys!.problemThree!.tr.obs; + RxString firstProblemStr = '问题一'.tr.obs; + RxString secondProblemStr = '问题二'.tr.obs; + RxString thirdProblemStr = '问题三'.tr.obs; - var firstQuestionId = 0.obs; - var secondQuestionId = 0.obs; - var thirdQuestionId = 0.obs; + RxInt firstQuestionId = 0.obs; + RxInt secondQuestionId = 0.obs; + RxInt thirdQuestionId = 0.obs; - var firstAnswerId = 0.obs; - var secondAnswerId = 0.obs; - var thirdAnswerId = 0.obs; + RxInt firstAnswerId = 0.obs; + RxInt secondAnswerId = 0.obs; + RxInt thirdAnswerId = 0.obs; - var firstAnswerStr = ''.obs; - var secondAnswerStr = ''.obs; - var thirdAnswerStr = ''.obs; - var countryCode = ''.obs; + RxString firstAnswerStr = ''.obs; + RxString secondAnswerStr = ''.obs; + RxString thirdAnswerStr = ''.obs; + RxString countryCode = ''.obs; - var questionAndAnswerList = [].obs; - var isUpdateAnswer = false.obs; + RxList questionAndAnswerList = [].obs; + RxBool isUpdateAnswer = false.obs; bool get answerIsOK => firstAnswerStr.value.isNotEmpty && secondAnswerStr.value.isNotEmpty && thirdAnswerStr.value.isNotEmpty; - var canSub = false.obs; + RxBool canSub = false.obs; MineSetSafetyProblemState() { if (Get.arguments != null) { Map map = Get.arguments; isUpdateAnswer.value = true; - firstProblemStr.value = map["firstProblemStr"]; - secondProblemStr.value = map["secondProblemStr"]; - thirdProblemStr.value = map["thirdProblemStr"]; - firstAnswerStr.value = map["firstAnswerStr"]; - secondAnswerStr.value = map["secondAnswerStr"]; - thirdAnswerStr.value = map["thirdAnswerStr"]; - firstQuestionId.value = map["firstQuestionId"]; - secondQuestionId.value = map["secondQuestionId"]; - thirdQuestionId.value = map["thirdQuestionId"]; - firstAnswerId.value = map["firstAnswerId"]; - secondAnswerId.value = map["secondAnswerId"]; - thirdAnswerId.value = map["thirdAnswerId"]; + firstProblemStr.value = map['firstProblemStr']; + secondProblemStr.value = map['secondProblemStr']; + thirdProblemStr.value = map['thirdProblemStr']; + firstAnswerStr.value = map['firstAnswerStr']; + secondAnswerStr.value = map['secondAnswerStr']; + thirdAnswerStr.value = map['thirdAnswerStr']; + firstQuestionId.value = map['firstQuestionId']; + secondQuestionId.value = map['secondQuestionId']; + thirdQuestionId.value = map['thirdQuestionId']; + firstAnswerId.value = map['firstAnswerId']; + secondAnswerId.value = map['secondAnswerId']; + thirdAnswerId.value = map['thirdAnswerId']; } } } diff --git a/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_page.dart b/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_page.dart index 784e6511..0936abb0 100755 --- a/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_page.dart @@ -34,7 +34,7 @@ class _MinePersonInfoViewSafetyProblemPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.safetyProblem!.tr, + barTitle: '安全问题'.tr, haveBack: true, actionsList: [ TextButton( @@ -69,7 +69,7 @@ class _MinePersonInfoViewSafetyProblemPageState color: AppColors.greyBackgroundColor, padding: EdgeInsets.all(20.h), child: Text( - TranslationLoader.lanKeys!.safetyProblemTip!.tr, + '当你手机丢了，可以通过回答设置的安全问题来登录新设备'.tr, style: TextStyle(fontSize: 18.sp), )), Obx(() => _safityProblemItem( diff --git a/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_state.dart b/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_state.dart index 61fa4bbe..de391d2d 100755 --- a/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_state.dart +++ b/lib/mine/minePersonInfo/minePersonInfoViewSafetyProblem/minePersonInfoViewSafetyProblem_state.dart @@ -2,19 +2,19 @@ import 'package:get/get.dart'; import 'package:star_lock/translations/trans_lib.dart'; class MineViewSafetyProblemState { - var firstProblemStr = TranslationLoader.lanKeys!.problemOne!.tr.obs; - var secondProblemStr = TranslationLoader.lanKeys!.problemTwo!.tr.obs; - var thirdProblemStr = TranslationLoader.lanKeys!.problemThree!.tr.obs; + RxString firstProblemStr = '问题一'.tr.obs; + RxString secondProblemStr = '问题二'.tr.obs; + RxString thirdProblemStr = '问题三'.tr.obs; - var firstAnswerStr = ''.obs; - var secondAnswerStr = ''.obs; - var thirdAnswerStr = ''.obs; + RxString firstAnswerStr = ''.obs; + RxString secondAnswerStr = ''.obs; + RxString thirdAnswerStr = ''.obs; - var firstQuestionId = 0.obs; - var secondQuestionId = 0.obs; - var thirdQuestionId = 0.obs; + RxInt firstQuestionId = 0.obs; + RxInt secondQuestionId = 0.obs; + RxInt thirdQuestionId = 0.obs; - var firstAnswerId = 0.obs; - var secondAnswerId = 0.obs; - var thirdAnswerId = 0.obs; + RxInt firstAnswerId = 0.obs; + RxInt secondAnswerId = 0.obs; + RxInt thirdAnswerId = 0.obs; } diff --git a/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart b/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart index 63f4e28c..23a6e60d 100755 --- a/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart +++ b/lib/mine/mineSet/appUnlockNeedMobileNetworkingLock/appUnlockNeedMobileNetworkingLock_page.dart @@ -48,8 +48,7 @@ class _APPUnlockNeedMobileNetworkingLockPageState extends State List tabs = [ '姓名'.tr, - TranslationLoader.lanKeys!.device!.tr + '设备'.tr ]; @override @@ -52,7 +52,7 @@ class _AuthorityManagementPageState extends State appBar: AppBar( backgroundColor: AppColors.mainColor, title: Text( - TranslationLoader.lanKeys!.authorityManagement!.tr, + '批量授权'.tr, style: TextStyle( color: Colors.white, fontSize: 28.sp, @@ -335,7 +335,7 @@ class _AuthorityManagementPageState extends State //去授权按钮-姓名 Widget _buildDeauthorizationBtn1() { return SubmitBtn( - btnName: TranslationLoader.lanKeys!.deAuthorize!.tr, + btnName: '去授权'.tr, onClick: () { Navigator.pushNamed(context, Routers.getDeviceListPage); }, @@ -345,7 +345,7 @@ class _AuthorityManagementPageState extends State //去授权按钮-关联设备 Widget _buildDeauthorizationBtn2() { return SubmitBtn( - btnName: TranslationLoader.lanKeys!.deAuthorize!.tr, + btnName: '去授权'.tr, onClick: () { Navigator.pushNamed(context, Routers.getNameListPage); }, diff --git a/lib/mine/mineSet/authorityManagement/getDeviceList_page.dart b/lib/mine/mineSet/authorityManagement/getDeviceList_page.dart index ddb2b122..fb01a4df 100755 --- a/lib/mine/mineSet/authorityManagement/getDeviceList_page.dart +++ b/lib/mine/mineSet/authorityManagement/getDeviceList_page.dart @@ -21,7 +21,7 @@ class _GetDeviceListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.associatedDevice!.tr, + barTitle: '关联设备'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/lib/mine/mineSet/authorityManagement/getNameList_page.dart b/lib/mine/mineSet/authorityManagement/getNameList_page.dart index f63fb1c9..c402a327 100755 --- a/lib/mine/mineSet/authorityManagement/getNameList_page.dart +++ b/lib/mine/mineSet/authorityManagement/getNameList_page.dart @@ -21,7 +21,7 @@ class _GetNameListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.associatedName!.tr, + barTitle: '关联姓名'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_page.dart b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_page.dart index 5b623a1f..3148ad6e 100755 --- a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_page.dart +++ b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministratorManage/addAuthorizedAdministratorManage_page.dart @@ -22,7 +22,7 @@ class _AddAuthorizedAdministratorManagePageState extends State[ diff --git a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart index fed02dbb..6ad514d5 100755 --- a/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart +++ b/lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart @@ -49,8 +49,7 @@ class _HideInvalidUnlockPermissionsPageState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - TranslationLoader.lanKeys!.hideInvalidUnlockPermissions!.tr, + barTitle:'隐藏无效开锁权限'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Container( @@ -77,7 +76,7 @@ class _HideInvalidUnlockPermissionsPageState children: [ Expanded( child: Text( - '${"当前模式".tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}', + '${"当前模式".tr} : ${_isOn == true ? '已开启'.tr : "已关闭".tr}', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 22.sp), )), @@ -88,8 +87,8 @@ class _HideInvalidUnlockPermissionsPageState ), SubmitBtn( btnName: _isOn == true - ? TranslationLoader.lanKeys!.close!.tr - : TranslationLoader.lanKeys!.open!.tr, + ? '关闭'.tr + : '开启'.tr, borderRadius: 20.w, fontSize: 32.sp, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), diff --git a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart index c9264987..e7be9c4e 100755 --- a/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart +++ b/lib/mine/mineSet/lockGroup/lockGroupList/lockGroupList_page.dart @@ -31,7 +31,7 @@ class _LockGroupListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.lockGroup!.tr, + barTitle: '锁分组'.tr, haveBack: true, actionsList: [ IconButton( diff --git a/lib/mine/mineSet/lockScreen/lockScreen_page.dart b/lib/mine/mineSet/lockScreen/lockScreen_page.dart index 30532fc0..706c71a5 100755 --- a/lib/mine/mineSet/lockScreen/lockScreen_page.dart +++ b/lib/mine/mineSet/lockScreen/lockScreen_page.dart @@ -46,7 +46,7 @@ class _LockScreenPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.lockScreen!.tr, + barTitle: '锁屏'.tr, // backAction: () { // Navigator.pop(context, true); // }, @@ -80,7 +80,7 @@ class _LockScreenPageState extends State { children: [ Expanded( child: Text( - '${"当前模式".tr} : ${_isOn == true ? TranslationLoader.lanKeys!.opened!.tr : TranslationLoader.lanKeys!.closed!.tr}', + '${"当前模式".tr} : ${_isOn == true ? '已开启'.tr : '已关闭'.tr}', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 22.sp), )), @@ -91,8 +91,8 @@ class _LockScreenPageState extends State { ), SubmitBtn( btnName: _isOn == true - ? TranslationLoader.lanKeys!.close!.tr - : TranslationLoader.lanKeys!.open!.tr, + ? '关闭'.tr + : '开启'.tr, onClick: () { _isFirst = false; setState(() { diff --git a/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart b/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart index 56bca6d3..61b6ea03 100755 --- a/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart +++ b/lib/mine/mineSet/lockUserManage/lockUserManageList/lockUserManageList_page.dart @@ -47,13 +47,13 @@ class _LockUserManageListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.lockUserManagement!.tr, + barTitle: '锁用户管理'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ TextButton( child: Text( - TranslationLoader.lanKeys!.aboutToExpire!.tr, + '即将到期'.tr, style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () { diff --git a/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_page.dart b/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_page.dart index 4e8ec6a0..2b1e52f7 100755 --- a/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_page.dart +++ b/lib/mine/mineSet/lockUserManage/ownedKeyList/ownedKeyList_page.dart @@ -47,7 +47,7 @@ class _OwnedKeyListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.ownedKey!.tr, + barTitle: '拥有的钥匙'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), @@ -76,7 +76,7 @@ class _OwnedKeyListPageState extends State { padding: EdgeInsets.only(left: 30.w, top: 20.w, right: 20.w, bottom: 10.w), child: Text( - TranslationLoader.lanKeys!.ownedKey!.tr, + '拥有的钥匙'.tr, style: TextStyle(fontSize: 24.sp), ), ), diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart index 496729f2..8f424f69 100755 --- a/lib/mine/mineSet/mineSet/mineSet_page.dart +++ b/lib/mine/mineSet/mineSet/mineSet_page.dart @@ -9,7 +9,6 @@ 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 'package:star_lock/tools/customer_tool.dart'; import '../../../appRouters.dart'; import '../../../app_settings/app_colors.dart'; @@ -62,12 +61,12 @@ class _MineSetPageState extends State appBar: widget.showAppBar ? F.sw( skyCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + barTitle: '更多设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), xhjCall: () => TitleAppBar( - barTitle: TranslationLoader.lanKeys!.moreSet!.tr, + barTitle: '更多设置'.tr, haveBack: true, backgroundColor: Colors.white, iconColor: AppColors.blackColor, @@ -174,7 +173,7 @@ class _MineSetPageState extends State F.sw( skyCall: () => const SizedBox(), xhjCall: () => CommonItem( - leftTitel: TranslationLoader.lanKeys!.personalInformation!.tr, + leftTitel: '个人信息'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -182,7 +181,7 @@ class _MineSetPageState extends State Get.toNamed(Routers.minePersonInfoPage); })), CommonItem( - leftTitel: TranslationLoader.lanKeys!.pushNotification!.tr, + leftTitel: '消息推送'.tr, rightTitle: '', isHaveRightWidget: true, isHaveLine: F.sw( @@ -205,7 +204,7 @@ class _MineSetPageState extends State // Container(), SizedBox(height: 10.h), CommonItem( - leftTitel: TranslationLoader.lanKeys!.lockUserManagement!.tr, + leftTitel: '锁用户管理'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -213,7 +212,7 @@ class _MineSetPageState extends State Get.toNamed(Routers.lockUserManageLisPage); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.authorizedAdmin!.tr, + leftTitel: '授权管理员'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -222,7 +221,7 @@ class _MineSetPageState extends State }), //by DaisyWu 新增--批量授权 CommonItem( - leftTitel: TranslationLoader.lanKeys!.authorityManagement!.tr, + leftTitel: '批量授权'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -231,7 +230,7 @@ class _MineSetPageState extends State // Toast.show(msg: "功能暂未开放"); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.lockGroup!.tr, + leftTitel: '锁分组'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -239,7 +238,7 @@ class _MineSetPageState extends State Get.toNamed(Routers.lockGroupListPage); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.transferSmartLock!.tr, + leftTitel: '转移智能锁'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -247,7 +246,7 @@ class _MineSetPageState extends State Get.toNamed(Routers.transferSmartLockPage); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.transferGateway!.tr, + leftTitel: '转移网关'.tr, rightTitle: '', isHaveLine: true, isHaveDirection: true, @@ -258,7 +257,7 @@ class _MineSetPageState extends State height: 10.h, ), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.multiLanguage!.tr, + leftTitel: '多语言'.tr, rightTitle: state.currentLanguage.value, isHaveLine: true, isHaveDirection: true, @@ -286,11 +285,10 @@ class _MineSetPageState extends State })), */ Obx(() => CommonItem( - leftTitel: - TranslationLoader.lanKeys!.hideInvalidUnlockPermissions!.tr, + leftTitel:'隐藏无效开锁权限'.tr, rightTitle: (state.hideExpiredAccessFlag.value == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr), + ? '已开启'.tr + : '已关闭'.tr), isHaveLine: true, isHaveDirection: true, action: () { @@ -303,8 +301,7 @@ class _MineSetPageState extends State }); })), CommonItem( - leftTitel: TranslationLoader - .lanKeys!.appUnlockRequiresMobilePhoneAccessToTheLock!.tr, + leftTitel: 'APP开锁时需手机连网的锁'.tr, rightTitle: '', // allHeight: 100.h, isHaveLine: true, @@ -314,7 +311,7 @@ class _MineSetPageState extends State context, Routers.aPPUnlockNeedMobileNetworkingLockPage); }), CommonItem( - leftTitel: TranslationLoader.lanKeys!.valueAddedServices!.tr, + leftTitel: '增值服务'.tr, isHaveLine: true, isHaveDirection: true, action: () { @@ -355,14 +352,14 @@ class _MineSetPageState extends State }), if (F.isXHJ) CommonItem( - leftTitel: TranslationLoader.lanKeys!.supportStaff!.tr, + leftTitel: '客服'.tr, isHaveLine: widget.showAbout, isHaveDirection: true, action: CustomerTool.openCustomerService, ), if (widget.showAbout) CommonItem( - leftTitel: TranslationLoader.lanKeys!.about!.tr, + leftTitel: '关于'.tr, isHaveLine: false, isHaveDirection: true, action: () { @@ -408,7 +405,7 @@ class _MineSetPageState extends State child: Column( children: [ SubmitBtn( - btnName: TranslationLoader.lanKeys!.logout!.tr, + btnName: '退出'.tr, isDelete: true, padding: EdgeInsets.symmetric(horizontal: 15.w), onClick: () { @@ -425,7 +422,7 @@ class _MineSetPageState extends State children: [ TextButton( child: Text( - TranslationLoader.lanKeys!.deleteAccount!.tr, + '删除账号'.tr, style: TextStyle( color: AppColors.darkGrayTextColor, fontSize: 18.sp), ), @@ -504,31 +501,31 @@ class _MineSetPageState extends State // ); // } - CupertinoSwitch _isPrompToneSwitch() { - return CupertinoSwitch( - activeColor: CupertinoColors.activeBlue, - trackColor: CupertinoColors.systemGrey5, - thumbColor: CupertinoColors.white, - value: state.isPrompTone.value, - onChanged: (bool value) { - state.isPrompTone.value = !state.isPrompTone.value; - logic.updatePrompToneRequest(); - }, - ); - } + // CupertinoSwitch _isPrompToneSwitch() { + // return CupertinoSwitch( + // activeColor: CupertinoColors.activeBlue, + // trackColor: CupertinoColors.systemGrey5, + // thumbColor: CupertinoColors.white, + // value: state.isPrompTone.value, + // onChanged: (bool value) { + // state.isPrompTone.value = !state.isPrompTone.value; + // logic.updatePrompToneRequest(); + // }, + // ); + // } - CupertinoSwitch _isTouchUnlockSwitch() { - return CupertinoSwitch( - activeColor: CupertinoColors.activeBlue, - trackColor: CupertinoColors.systemGrey5, - thumbColor: CupertinoColors.white, - value: state.isTouchUnlock.value, - onChanged: (bool value) { - state.isTouchUnlock.value = !state.isTouchUnlock.value; - logic.updateTouchUnlockRequest(); - }, - ); - } + // CupertinoSwitch _isTouchUnlockSwitch() { + // return CupertinoSwitch( + // activeColor: CupertinoColors.activeBlue, + // trackColor: CupertinoColors.systemGrey5, + // thumbColor: CupertinoColors.white, + // value: state.isTouchUnlock.value, + // onChanged: (bool value) { + // state.isTouchUnlock.value = !state.isTouchUnlock.value; + // logic.updateTouchUnlockRequest(); + // }, + // ); + // } //微信公众号推送开关 CupertinoSwitch _isWechatPublicAccountPushSwitch() { diff --git a/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart b/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart index 57cc2e9b..23285f45 100755 --- a/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart +++ b/lib/mine/mineSet/transferGateway/selectGetewayList_page.dart @@ -26,7 +26,7 @@ class _SelectGetewayListPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.selectGateway!.tr, + barTitle: '选择网关'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart b/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart index 218e5bbf..7004a9d0 100755 --- a/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart +++ b/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart @@ -34,7 +34,7 @@ class _RecipientInformationPageState extends State { resizeToAvoidBottomInset: false, backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.recipientInformation!.tr, + barTitle: '接收人信息'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), @@ -173,7 +173,7 @@ class _RecipientInformationPageState extends State { height: 1, ), CommonItem( - leftTitel: TranslationLoader.lanKeys!.countryAndRegion!.tr, + leftTitel: '国家/地区'.tr, rightTitle: '', isHaveLine: true, isHaveRightWidget: true, diff --git a/lib/mine/mineSet/transferSmartLock/selectBranch/selectBranch_page.dart b/lib/mine/mineSet/transferSmartLock/selectBranch/selectBranch_page.dart index 89930069..0993e5a8 100755 --- a/lib/mine/mineSet/transferSmartLock/selectBranch/selectBranch_page.dart +++ b/lib/mine/mineSet/transferSmartLock/selectBranch/selectBranch_page.dart @@ -26,7 +26,7 @@ class _SelectBranchPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.recipientInformation!.tr, + barTitle: '接收人信息'.tr, haveBack: true, backgroundColor: AppColors.mainColor, ), diff --git a/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart b/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart index fc4aca6e..ae9da4cb 100755 --- a/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart +++ b/lib/mine/mineSet/transferSmartLock/transferSmartLockList/transferSmartLock_page.dart @@ -45,7 +45,7 @@ class _TransferSmartLockPageState extends State with Rout return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.selectiveLock!.tr, + barTitle: '选择锁'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/mine/supportStaff/supportStaff_page.dart b/lib/mine/supportStaff/supportStaff_page.dart index 9163fffd..02e19795 100755 --- a/lib/mine/supportStaff/supportStaff_page.dart +++ b/lib/mine/supportStaff/supportStaff_page.dart @@ -21,14 +21,14 @@ class _SupportStaffPageState extends State { return Scaffold( backgroundColor: const Color(0xFFFFFFFF), appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.supportStaff!.tr, + barTitle: '客服'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( - children: [ + children: [ supportStaffItem( - TranslationLoader.lanKeys!.email!.tr, - "786612630@qq.com", + '邮箱'.tr, + '786612630@qq.com', true, true, 'images/mine/icon_mine_supportStaff_openEmail.png', () async { @@ -37,30 +37,30 @@ class _SupportStaffPageState extends State { _pushUrl(url); }), supportStaffItem( - TranslationLoader.lanKeys!.businessCooperation!.tr, - "www.starLock.com", + '商务合作'.tr, + 'www.starLock.com', true, true, 'images/mine/icon_mine_supportStaff_openEmail.png', () async { - const url = 'tel:15080825640'; + const String url = 'tel:15080825640'; _pushUrl(url); }), supportStaffItem( - TranslationLoader.lanKeys!.officialWebsite!.tr, - "www.starLock.com", + '电脑网页版'.tr, + 'www.starLock.com', true, true, 'images/mine/icon_mine_supportStaff_jump.png', () async { - const url = 'https://blog.csdn.net/shulianghan'; + const String url = 'https://blog.csdn.net/shulianghan'; _pushUrl(url); }), - supportStaffItem(TranslationLoader.lanKeys!.computerWebVersion!.tr, - "www.starLock.com", false, true, '', () {}), - supportStaffItem(TranslationLoader.lanKeys!.hotelSystem!.tr, - "www.starLock.com", false, true, '', () {}), + supportStaffItem('电脑网页版'.tr, + 'www.starLock.com', false, true, '', () {}), + supportStaffItem('酒店系统'.tr, + 'www.starLock.com', false, true, '', () {}), supportStaffItem( - TranslationLoader.lanKeys!.manualWebVersion!.tr, - "www.starLock.com", + '说明书网页版'.tr, + 'www.starLock.com', true, true, 'images/mine/icon_mine_supportStaff_jump.png', @@ -90,44 +90,40 @@ class _SupportStaffPageState extends State { onTap: action, child: Column( // mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ Container( height: 80.h, color: Colors.white, padding: EdgeInsets.only( left: 20.w, right: 10.w), // , top: 20.w, bottom: 20.w child: Row( - children: [ + children: [ SizedBox(width: 20.w), Expanded( child: Text(leftTitel!, style: TextStyle(fontSize: 24.sp))), SizedBox(width: 20.w), Row( mainAxisAlignment: MainAxisAlignment.end, - children: [ + children: [ Text(rightTitle!, textAlign: TextAlign.end, style: TextStyle(fontSize: 22.sp)) ], ), SizedBox(width: 5.w), - isHaveRightImg! - ? Image.asset( + if (isHaveRightImg!) Image.asset( rightImg!, width: 36.w, height: 36.w, - ) - : SizedBox(width: 10.w), + ) else SizedBox(width: 10.w), // SizedBox(width:10.w), ], ), ), - isHaveLine! - ? Container( + if (isHaveLine!) Container( height: 0.5.h, color: AppColors.greyLineColor, - ) - : Container() + ) else Container() ], ), ); diff --git a/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart b/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart index b7674d2f..141f34c8 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart @@ -122,7 +122,7 @@ class _ValueAddedServicesHighFunctionPageState ), child: Center( child: Text( - TranslationLoader.lanKeys!.buy!.tr, + '购买'.tr, style: TextStyle(fontSize: 22.sp), )), ), @@ -147,7 +147,7 @@ class _ValueAddedServicesHighFunctionPageState ), child: Center( child: Text( - TranslationLoader.lanKeys!.record!.tr, + '记录'.tr, style: TextStyle(fontSize: 22.sp), )), ), @@ -176,8 +176,7 @@ class _ValueAddedServicesHighFunctionPageState height: 30.w), Expanded( child: Text( - TranslationLoader - .lanKeys!.advancedFeaturesAndBenefitsContent!.tr, + '高级功能权益内容'.tr, textAlign: TextAlign.center, style: TextStyle( fontSize: 24.sp, fontWeight: FontWeight.w600)), @@ -225,19 +224,19 @@ class _ValueAddedServicesHighFunctionPageState physics: const NeverScrollableScrollPhysics(), children: [ _buildItem('images/mine/icon_mine_highFunctionContent_dxmb.png', - TranslationLoader.lanKeys!.smsTemplate!.tr), + '短信模板'.tr), _buildItem('images/mine/icon_mine_highFunctionContent_yjmb.png', - TranslationLoader.lanKeys!.emailTemplate!.tr), + '邮件模板'.tr), _buildItem('images/mine/icon_mine_highFunctionContent_sqgly.png', - TranslationLoader.lanKeys!.authorizedAdmin!.tr), + '授权管理员'.tr), _buildItem('images/mine/icon_mine_highFunctionContent_sfz.png', - TranslationLoader.lanKeys!.lockGroup!.tr), + '锁分组'.tr), _buildItem('images/mine/icon_mine_highFunctionContent_bjft.png', '群发钥匙'.tr), // _buildItem("images/mine/icon_mine_highFunctionContent_bjft.png", // TranslationLoader.lanKeys!.markedHouseState!.tr), _buildItem('images/mine/icon_mine_highFunctionContent_fkgj.png', - TranslationLoader.lanKeys!.cardIssuingtool!.tr), + '发卡工具'.tr), _buildItem( 'images/mine/icon_mine_highFunctionContent_fkgj.png', '推送'), _buildItem( @@ -302,8 +301,7 @@ class _ValueAddedServicesHighFunctionPageState ), Expanded( child: Text( - TranslationLoader - .lanKeys!.titleForBuyingAdvancedFeatures!.tr, + '购买高级功能须知'.tr, textAlign: TextAlign.center, style: TextStyle( fontSize: 24.sp, fontWeight: FontWeight.w600))), @@ -327,7 +325,7 @@ class _ValueAddedServicesHighFunctionPageState padding: EdgeInsets.only( left: 30.w, top: 30.h, right: 30.w, bottom: 30.h), child: Text( - TranslationLoader.lanKeys!.tipsForBuyingAdvancedFeatures!.tr, + '购买高级功能提示'.tr, style: TextStyle(fontSize: 20.sp), )), ), @@ -353,7 +351,7 @@ class _ValueAddedServicesHighFunctionPageState ), child: Center( child: Text( - TranslationLoader.lanKeys!.freeTrial!.tr, + '免费体验'.tr, style: TextStyle(fontSize: 24.sp), )), ), @@ -375,7 +373,7 @@ class _ValueAddedServicesHighFunctionPageState ), child: Center( child: Text( - TranslationLoader.lanKeys!.openNow!.tr, + '立即开通'.tr, style: TextStyle(fontSize: 24.sp, color: const Color(0xFFF9CEAC)), )), diff --git a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 8f31651c..1639eeea 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -40,20 +40,20 @@ class _ValueAddedServicesPageListState return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.valueAddedServices!.tr, + barTitle: '增值服务'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( children: [ _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_note.png'), - TranslationLoader.lanKeys!.note!.tr, () { + '短信'.tr, () { Get.toNamed(Routers.valueAddedServicesNoteAndEmailDetailPage, arguments: {'type': 1}); }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_email.png'), - TranslationLoader.lanKeys!.mail!.tr, () { + '邮件'.tr, () { Get.toNamed(Routers.valueAddedServicesNoteAndEmailDetailPage, arguments: {'type': 2}); }), @@ -62,7 +62,7 @@ class _ValueAddedServicesPageListState }), _valueAddedServicesItem( Image.asset('images/mine/icon_mine_valueAddedServices_vip.png'), - TranslationLoader.lanKeys!.advancedFunction!.tr, () async { + '高级功能'.tr, () async { final bool? isVip = await Storage.getBool(saveIsVip); if (isVip == null || !isVip) { if (CommonDataManage().currentKeyInfo.isLockOwner != 1) { @@ -90,9 +90,8 @@ class _ValueAddedServicesPageListState // Navigator.pushNamed(context, Routers.gatewayDetailPage); // }), _valueAddedServicesItem( - Image.asset( - 'images/mine/icon_mine_valueAddedServices_storage.png'), - TranslationLoader.lanKeys!.recordsRetention!.tr, () { + Image.asset('images/mine/icon_mine_valueAddedServices_storage.png'), + '记录保存'.tr, () { EasyLoading.showToast('功能暂未开放', duration: 2000.milliseconds); }), _valueAddedServicesItem( diff --git a/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart b/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart index 0cfea926..48d10b76 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesNoteAndEmailDetail/valueAddedServicesNoteAndEmailDetail_page.dart @@ -39,8 +39,8 @@ class _ValueAddedServicesNoteAndEmailDetailPageState backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( barTitle: state.selectType.value == 1 - ? TranslationLoader.lanKeys!.note!.tr - : TranslationLoader.lanKeys!.mail!.tr, + ? '短信'.tr + : '邮件'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -51,8 +51,8 @@ class _ValueAddedServicesNoteAndEmailDetailPageState left: 25.h, right: 25.h, top: 25.h, bottom: 10.h), child: Text( state.selectType.value == 1 - ? TranslationLoader.lanKeys!.smsBuyTip!.tr - : TranslationLoader.lanKeys!.emailBuyTip!.tr, + ? '您可通过短信将密码、电子钥匙信息发给接收人。'.tr + : '您可通过邮件将密码、电子钥匙信息发给接收人。'.tr, style: TextStyle( color: AppColors.darkGrayTextColor, fontSize: 18.sp), )), @@ -79,7 +79,7 @@ class _ValueAddedServicesNoteAndEmailDetailPageState children: [ Expanded( child: Obx(() => Text( - '${TranslationLoader.lanKeys!.currentRemainingQuantity!.tr}:${state.remainCount.value}', + '${'当前剩余数量'.tr}:${state.remainCount.value}', style: TextStyle(fontSize: 24.sp), ))), GestureDetector( @@ -98,7 +98,7 @@ class _ValueAddedServicesNoteAndEmailDetailPageState color: AppColors.mainColor, borderRadius: BorderRadius.circular(25)), child: Center( - child: Text(TranslationLoader.lanKeys!.buy!.tr, + child: Text('购买'.tr, style: TextStyle( color: Colors.white, fontSize: 24.sp)))), ), @@ -151,7 +151,7 @@ class _ValueAddedServicesNoteAndEmailDetailPageState top: 5, bottom: 5, left: 5, right: 5), // color: Colors.red, child: Center( - child: Text(TranslationLoader.lanKeys!.record!.tr, + child: Text('记录'.tr, style: TextStyle( color: Colors.black, fontSize: 24.sp)))), ), diff --git a/lib/mine/valueAddedServices/valueAddedServicesRealName/value_added_services_real_name_page.dart b/lib/mine/valueAddedServices/valueAddedServicesRealName/value_added_services_real_name_page.dart index 5ceead34..9d643ffe 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesRealName/value_added_services_real_name_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesRealName/value_added_services_real_name_page.dart @@ -41,7 +41,7 @@ class _ValueAddedServicesRealNamePageState padding: EdgeInsets.only( left: 25.h, right: 25.h, top: 25.h, bottom: 10.h), child: Text( - TranslationLoader.lanKeys!.buyRealNameTip!.tr, + '购买实名认证提示'.tr, style: TextStyle( color: AppColors.darkGrayTextColor, fontSize: 20.sp), )), @@ -126,18 +126,17 @@ class _ValueAddedServicesRealNamePageState Container( padding: EdgeInsets.only(top: 20.h, bottom: 20.h, left: 30.w), child: Text( - TranslationLoader - .lanKeys!.buyRealNameSelectYouWantBuyTip!.tr, + '请选择你希望的实名认证频次'.tr, style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600), )), ], ), checkCommonItem( - logic, TranslationLoader.lanKeys!.forTheFirstTime!.tr, 1), - checkCommonItem(logic, TranslationLoader.lanKeys!.onceDay!.tr, 2), - checkCommonItem(logic, TranslationLoader.lanKeys!.weekOnce!.tr, 3), - checkCommonItem(logic, TranslationLoader.lanKeys!.monthOnce!.tr, 4, + logic, '仅首次'.tr, 1), + checkCommonItem(logic, '每日一次'.tr, 2), + checkCommonItem(logic, '每周一次', 3), + checkCommonItem(logic, '每月一次'.tr, 4, isHaveLine: false, isHaveRightWidget: true), ], ), diff --git a/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/customSMSTemplateList_page.dart b/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/customSMSTemplateList_page.dart index bc85004b..474ceb61 100755 --- a/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/customSMSTemplateList_page.dart +++ b/lib/mine/valueAddedServices/valueAddedServicesSMSTemplate/valueAddedServicesListSMSTemplate/customSMSTemplateList_page.dart @@ -123,7 +123,7 @@ class _CustomSMSTemplateListPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - '${TranslationLoader.lanKeys!.currentState!.tr}：${TranslationLoader.lanKeys!.onTrial!.tr}', + '${'当前状态'.tr}：${'试用中'.tr}', style: TextStyle( fontSize: 20.sp, fontWeight: FontWeight.w600), ), diff --git a/lib/translations/lanKeyEntity.dart b/lib/translations/lanKeyEntity.dart index 1d84bd0e..f981bc9a 100755 --- a/lib/translations/lanKeyEntity.dart +++ b/lib/translations/lanKeyEntity.dart @@ -1,360 +1,42 @@ class LanKeyEntity { LanKeyEntity({ - // this.starLock, - // this.clickUnlockAndHoldDownClose, - // this.checkingIn, - // this.electronicKey, - // this.password, - // this.card, - // this.fingerprint, - // this.remoteControl, - // this.face, - // this.operatingRecord, - // this.doorLockLog, - // this.number, - // this.additive, - // this.addTime, - // this.reset, - // this.sendKey, - // this.timeLimit, - // this.permanent, - // this.once, - // this.circulation, - // this.receiver, - // this.pleaseEnterNumberOrEmail, - // this.name, - // this.enterYourName, - // this.effectiveTime, - // this.failureTime, - // this.effectiveDate, - // this.failureDate, - // this.monday, - // this.tuesday, - // this.wednesday, - // this.thursday, - // this.friday, - // this.saturday, - // this.sunday, - // this.mondayShort, - // this.tuesdayShort, - // this.wednesdayShort, - // this.thursdayShort, - // this.fridayShort, - // this.saturdayShort, - // this.sundayShort, - - // this.realNameAuthentication, - // this.sendKeyBottomTip, - // this.send, - // this.periodValidity, - // this.sendGroupKey, - // this.lock, - // this.pleaseAdd, - // this.pleaseSelect, - // this.remoteUnlockingAllowed, - // this.pleaseEnter, - // this.getPassword, - // this.custom, - // this.clearAll, - // this.recursiveDevice, - // this.pleaseNameYourPassword, - // this.pleaseEnterDigitsNumber, - // this.getPasswordTip1, - // this.getPasswordTip2, - // this.getPasswordTip3, - // this.getPasswordTip4, - // this.getPasswordTip5, - // this.getPasswordTip6, - // this.getTip, - // this.addTip, - // this.sender, - // this.senderTime, - // this.keyDetail, - // this.detail, - // this.delete, - // this.passwordDetail, - // this.share, - // this.amend, - // this.sure, - // this.cancel, - - // this.add, - // this.accountNumber, - // this.volumeAuthorizationLock, - // this.authorizedAdminTip, - // this.lockOperatingRecordTip, - // this.rankingList, - // this.earlyArrivalList, - // this.lateList, - // this.hardWorkingList, - // this.basicInformation, - // this.wirelessKeyboard, - // this.doorMagnetic, - // this.remoteUnlocking, - // this.automaticBlocking, - // this.normallyOpenMode, - // this.automaticUnLock, - // this.automaticUnLockTip, - // this.lockSound, - // this.burglarAlarm, - // this.resetButton, - // this.lockTime, - // this.diagnose, - // this.uploadData, - // this.importOtherLockData, - // this.lockEscalation, - // this.markedHouseState, - // this.unlockReminder, - // this.unlockQRCode, - // this.lockNumber, - // this.electricQuantity, - // this.lockName, - // this.lockGrouping, - // this.selectGroup, - // this.createNewGroup, - // this.adminOpenLockPassword, - // this.update, - // this.updateElectricQuantityTip, - // this.adminOpenLockPasswordTip, - // this.updateLockAdminPassword, - // this.whenScreenFlashesClickNext, - // this.theScreenNeverFlickered, - // this.enterNumberOrPressSet, - // this.theLocationOfTheSetKeyWillBeDifferent, - // this.pressAndHoldTheResetButtonTwoSeconds, - // this.nearbyEquipment, - // this.noData, - // this.doorMagneticListTopTip, - // this.remoteUnlockingPageTip, - // this.currentMode, - // this.delayTime, - // this.automaticBlockingTip, - // this.time, - // this.normallyOpen, - // this.date, - // this.begin, - // this.end, - // this.allDay, - // this.save, - // this.normallyOpenModeTip, - // this.pleaseSelectLockVolume, - // this.lockSoundTip, - // this.low, - // this.lower, - // this.medium, - // this.high, - // this.higher, - // this.burglarAlarmTip, - // this.resetButtonTip1, - // this.resetButtonTip2, - // this.calibrationTime, - // this.setTheDSTMode, - // this.diagnoseTip, - // this.uploading, - // this.uploadDataTip, - // this.importOtherLockDataTip, - // this.haveNewVersion, - // this.currentVersion, - // this.newVersion, - // this.upgrade, - // this.leisure, - // this.checkedIn, - // this.company, - // this.staff, - // this.work, - // this.workday, - // this.holidays, - // this.punchingMode, - // this.whetherTheEmployeeHasAKey, - // this.selectKey, - // this.officeHours, - // this.closingTime, - // this.thisWeek, - // this.singleDayWeekend, - // this.twoDaysOff, - // this.oddOrEvenDaysOff, - // this.year, - // this.month, - // this.libertyDay, - // this.coverDate, - // this.addedHoliday, - // this.startDate, - // this.accessDate, - // this.mustFillIn, - // this.endDate, - // this.dailyCharts, - // this.monthlyLeaderboard, - // this.noAttendanceRecord, - // this.everyoneIsVeryMotivated, - // this.workingHoursWereNotReleased, - // this.beLate, - // this.leaveEarly, - // this.noCardPunched, - // this.holidayInfo, - // this.lanEnglish, - // this.lanChinese, - // this.multilingual, - // this.addLock, - // this.lockAddress, - // this.selectLockType, - // this.videoIntercomDoorLock, - // this.NFCPassiveLock, - // this.addDevice, - // this.gateway, - // this.message, - this.supportStaff, - this.set, - this.moreServices, - this.moreSet, - this.prompTone, - this.touchUnlock, - this.pushNotification, - this.lockUserManagement, - this.ownedKey, - this.authorityManagement, - this.associatedDevice, - this.associatedName, - this.device, - this.authorizedAdmin, - this.addAuthorizedAdmin, - this.lockGroup, - this.transferSmartLock, - this.selectiveLock, - this.recipientInformation, - this.transferGateway, - this.multiLanguage, - this.lockScreen, - this.closed, - this.opened, - this.close, - this.open, - this.hideInvalidUnlockPermissions, - this.appUnlockRequiresMobilePhoneAccessToTheLock, - this.valueAddedServices, - this.about, - this.userAgreement, - this.privacyPolicy, - this.personalInformationCollectionList, - this.applicationPermissionDescription, - this.thirdPartyInformationSharingList, - this.logout, - this.deleteAccount, - this.personalInformation, - this.avatar, - this.nickName, - this.changeNickName, - this.modifyAccount, - this.resetPasswords, - this.safetyProblem, - this.modifyAccountTip, - this.pleaseEnterAccountNumber, - this.pleaseEnterNewAccountNumber, - this.changeIphoneTip, - this.changeEmailTip, - this.goBind, - this.originalPassword, - this.newPassword, - this.surePassword, - this.safetyProblemTip, - this.problemOne, - this.problemTwo, - this.problemThree, - this.pleaseEnterYourAnswer, - this.aboutToExpire, - this.deAuthorize, - this.changeName, - this.designation, - this.state, - this.wifiName, - this.networkMAC, - this.gatewayUpgrade, - this.gatewayConnectionLock, - this.strongSignal, - this.mediumSignal, - this.averageSignal, - this.weakSignal, - this.selectGatewayType, - this.addGateway, - this.turnThePowerBackOn, - this.indicatorLight, - this.selectGatewayTypeNextTip, - this.selectGateway, - this.gatewayConfigurationWifiTip, - this.wifiPassward, - this.pleaseEnterTheWiFiPassword, - this.gatewayName, - this.pleaseEnterGatewayName, - this.wifiMAC, - this.ipAddress, - this.subnetMask, - this.defaultGateway, - this.automaticallyGetTheDNSServerAddress, - this.preferredDNS, - this.alternativeDNS, - this.noStaticIPIsUsed, - this.allLock, - this.searchAllLockType, - this.doorLock, - this.padlock, - this.safeLock, - this.intelligentLockCore, - this.itelligentAccessControl, - this.parkingLock, - this.bicycleLock, - this.longRangeControl, - this.lightTouchScreen, - this.lightTouchScreenTip, - this.next, - this.nearbyLock, - this.addSuccessfullyPleaseRename, - this.whenAddingLockThePhoneMustBeNextToTheLock, - this.login, - this.register, - this.forgetPassword, - this.readAndAgree, - this.verificationCode, - this.registerPasswordTip, - this.iphone, - this.email, - this.mobileNumber, - this.countryAndRegion, - this.select, - 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, - this.buy, - this.customSMSTemplate, - this.customMailTemplate, - this.record, - this.buyRealNameTip, - this.buyRealNameSelectYouWantBuyTip, - this.forTheFirstTime, - this.onceDay, - this.weekOnce, - this.monthOnce, - this.currentState, - this.onTrial, - this.haveNotOpened, - this.advancedFeaturesAndBenefitsContent, - this.smsTemplate, - this.emailTemplate, - this.cardIssuingtool, - this.titleForBuyingAdvancedFeatures, - this.tipsForBuyingAdvancedFeatures, - this.freeTrial, - this.openNow, + // this.select, + // 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, + // this.buy, + // this.customSMSTemplate, + // this.customMailTemplate, + // this.record, + // this.buyRealNameTip, + // this.buyRealNameSelectYouWantBuyTip, + // this.forTheFirstTime, + // this.onceDay, + // this.weekOnce, + // this.monthOnce, + // this.currentState, + // this.onTrial, + // this.haveNotOpened, + // this.advancedFeaturesAndBenefitsContent, + // this.smsTemplate, + // this.emailTemplate, + // this.cardIssuingtool, + // this.titleForBuyingAdvancedFeatures, + // this.tipsForBuyingAdvancedFeatures, + // this.freeTrial, + // this.openNow, this.buySMS, this.buyMail, this.buyRealNameAuthenticationTimes, @@ -389,7 +71,7 @@ class LanKeyEntity { this.hideInvalidUnlockPermissionsTip, this.appUnlockRequiresMobilePhoneAccessToTheLockTip, this.checkAll, - this.getVerificationCode, + // this.getVerificationCode, this.configuringWiFi, this.pleaseEnterWifiName, this.wifiPwd, @@ -460,382 +142,48 @@ class LanKeyEntity { }); LanKeyEntity.fromJson(dynamic json) { - // starLock = json['starLock']; - // clickUnlockAndHoldDownClose = json['clickUnlockAndHoldDownClose']; - // checkingIn = json['checkingIn']; - // electronicKey = json['electronicKey']; - // password = json['password']; - // card = json['card']; - // fingerprint = json['fingerprint']; - // remoteControl = json['remoteControl']; - // face = json['face']; - // operatingRecord = json['operatingRecord']; - // doorLockLog = json['doorLockLog']; - // number = json['number']; - // additive = json['additive']; - // addTime = json['addTime']; - // reset = json['reset']; - // sendKey = json['sendKey']; - // timeLimit = json['timeLimit']; - // permanent = json['permanent']; - // once = json['once']; - // circulation = json['circulation']; - // receiver = json['receiver']; - // pleaseEnterNumberOrEmail = json['pleaseEnterNumberOrEmail']; - // name = json['name']; - // enterYourName = json['enterYourName']; - // effectiveTime = json['effectiveTime']; - // failureTime = json['failureTime']; - // effectiveDate = json['effectiveDate']; - // failureDate = json['failureDate']; - // monday = json['monday']; - // tuesday = json['tuesday']; - // wednesday = json['wednesday']; - // thursday = json['thursday']; - // friday = json['friday']; - // saturday = json['saturday']; - // sunday = json['sunday']; + // select = json['select']; - // mondayShort = json['mondayShort']; - // tuesdayShort = json['tuesdayShort']; - // wednesdayShort = json['wednesdayShort']; - // thursdayShort = json['thursdayShort']; - // fridayShort = json['fridayShort']; - // saturdayShort = json['saturdayShort']; - // sundayShort = json['sundayShort']; + // businessCooperation = json['businessCooperation']; + // officialWebsite = json['officialWebsite']; + // computerWebVersion = json['computerWebVersion']; + // hotelSystem = json['hotelSystem']; + // manualWebVersion = json['manualWebVersion']; + // introduce = json['introduce']; - // realNameAuthentication = json['realNameAuthentication']; - // sendKeyBottomTip = json['sendKeyBottomTip']; - // send = json['send']; - // periodValidity = json['periodValidity']; - // sendGroupKey = json['sendGroupKey']; - // lock = json['lock']; - // pleaseAdd = json['pleaseAdd']; - // pleaseSelect = json['pleaseSelect']; - // remoteUnlockingAllowed = json['remoteUnlockingAllowed']; - // pleaseEnter = json['pleaseEnter']; - // getPassword = json['getPassword']; - // custom = json['custom']; - // clearAll = json['clearAll']; - // recursiveDevice = json['recursiveDevice']; - // pleaseNameYourPassword = json['pleaseNameYourPassword']; - // pleaseEnterDigitsNumber = json['pleaseEnterDigitsNumber']; - // getPasswordTip1 = json['getPasswordTip1']; - // getPasswordTip2 = json['getPasswordTip2']; - // getPasswordTip3 = json['getPasswordTip3']; - // getPasswordTip4 = json['getPasswordTip4']; - // getPasswordTip5 = json['getPasswordTip5']; - // getPasswordTip6 = json['getPasswordTip6']; - // getTip = json['getTip']; - // addTip = json['addTip']; - // sender = json['sender']; - // senderTime = json['senderTime']; - // keyDetail = json['keyDetail']; - // detail = json['detail']; - // delete = json['delete']; - // passwordDetail = json['passwordDetail']; - // share = json['share']; - // amend = json['amend']; - // sure = json['sure']; - // cancel = json['cancel']; - // add = json['add']; - // accountNumber = json['accountNumber']; - // volumeAuthorizationLock = json['volumeAuthorizationLock']; - // authorizedAdminTip = json['authorizedAdminTip']; - // lockOperatingRecordTip = json['lockOperatingRecordTip']; - // remoteUnlockingPageTip = json['remoteUnlockingPageTip']; - // currentMode = json['currentMode']; - // delayTime = json['delayTime']; - // automaticBlockingTip = json['automaticBlockingTip']; - // time = json['time']; - // normallyOpen = json['normallyOpen']; - // date = json['date']; - // begin = json['begin']; - // end = json['end']; - // allDay = json['allDay']; - // save = json['save']; - // normallyOpenModeTip = json['normallyOpenModeTip']; - // pleaseSelectLockVolume = json['pleaseSelectLockVolume']; - // lockSoundTip = json['lockSoundTip']; - // low = json['low']; - // lower = json['lower']; - // medium = json['medium']; - // high = json['high']; - // higher = json['higher']; - // burglarAlarmTip = json['burglarAlarmTip']; - // resetButtonTip1 = json['resetButtonTip1']; - // resetButtonTip2 = json['resetButtonTip2']; - // calibrationTime = json['calibrationTime']; - // setTheDSTMode = json['setTheDSTMode']; - // diagnoseTip = json['diagnoseTip']; - // uploading = json['uploading']; - // uploadDataTip = json['uploadDataTip']; - // importOtherLockDataTip = json['importOtherLockDataTip']; - // haveNewVersion = json['haveNewVersion']; - // currentVersion = json['currentVersion']; - // newVersion = json['newVersion']; - // upgrade = json['upgrade']; - // leisure = json['leisure']; - // checkedIn = json['checkedIn']; + // note = json['note']; + // mail = json['mail']; + // advancedFunction = json['advancedFunction']; + // pushMessage = json['pushMessage']; + // recordsRetention = json['recordsRetention']; - // basicInformation = json['basicInformation']; - // wirelessKeyboard = json['wirelessKeyboard']; - // doorMagnetic = json['doorMagnetic']; - // remoteUnlocking = json['remoteUnlocking']; - // automaticBlocking = json['automaticBlocking']; - // normallyOpenMode = json['normallyOpenMode']; - // automaticUnLock = json['automaticUnLock']; - // automaticUnLockTip = json['automaticUnLockTip']; - // lockSound = json['lockSound']; - // burglarAlarm = json['burglarAlarm']; - // resetButton = json['resetButton']; - // lockTime = json['lockTime']; - // diagnose = json['diagnose']; - // uploadData = json['uploadData']; - // importOtherLockData = json['importOtherLockData']; - // lockEscalation = json['lockEscalation']; - // markedHouseState = json['markedHouseState']; - // unlockReminder = json['unlockReminder']; - // unlockQRCode = json['unlockQRCode']; - // lockNumber = json['lockNumber']; - // electricQuantity = json['electricQuantity']; - // lockName = json['lockName']; - // lockGrouping = json['lockGrouping']; - // selectGroup = json['selectGroup']; - // createNewGroup = json['createNewGroup']; - // adminOpenLockPassword = json['adminOpenLockPassword']; - // update = json['update']; - // updateElectricQuantityTip = json['updateElectricQuantityTip']; - // adminOpenLockPasswordTip = json['adminOpenLockPasswordTip']; - // updateLockAdminPassword = json['updateLockAdminPassword']; - // whenScreenFlashesClickNext = json['whenScreenFlashesClickNext']; - // theScreenNeverFlickered = json['theScreenNeverFlickered']; - // enterNumberOrPressSet = json['enterNumberOrPressSet']; - // theLocationOfTheSetKeyWillBeDifferent = json['theLocationOfTheSetKeyWillBeDifferent']; - // pressAndHoldTheResetButtonTwoSeconds = json['pressAndHoldTheResetButtonTwoSeconds']; - // nearbyEquipment = json['nearbyEquipment']; - // noData = json['noData']; - // doorMagneticListTopTip = json['doorMagneticListTopTip']; - // rankingList = json['rankingList']; - // earlyArrivalList = json['earlyArrivalList']; - // lateList = json['lateList']; - // hardWorkingList = json['hardWorkingList']; - // company = json['company']; - // staff = json['staff']; - // work = json['work']; - // workday = json['workday']; - // holidays = json['holidays']; - // punchingMode = json['punchingMode']; - // whetherTheEmployeeHasAKey = json['whetherTheEmployeeHasAKey']; - // selectKey = json['selectKey']; - // officeHours = json['officeHours']; - // closingTime = json['closingTime']; - // thisWeek = json['thisWeek']; - // singleDayWeekend = json['singleDayWeekend']; + // smsBuyTip = json['smsBuyTip']; + // emailBuyTip = json['emailBuyTip']; + // currentRemainingQuantity = json['currentRemainingQuantity']; + // buy = json['buy']; + // customSMSTemplate = json['customSMSTemplate']; + // customMailTemplate = json['customMailTemplate']; + // record = json['record']; - // twoDaysOff = json['twoDaysOff']; - // oddOrEvenDaysOff = json['oddOrEvenDaysOff']; - // year = json['year']; - // month = json['month']; - // libertyDay = json['libertyDay']; - // coverDate = json['coverDate']; - // addedHoliday = json['addedHoliday']; - // startDate = json['startDate']; - // accessDate = json['accessDate']; - // mustFillIn = json['mustFillIn']; - // endDate = json['endDate']; - // dailyCharts = json['dailyCharts']; - // monthlyLeaderboard = json['monthlyLeaderboard']; - // noAttendanceRecord = json['noAttendanceRecord']; - // everyoneIsVeryMotivated = json['everyoneIsVeryMotivated']; - // workingHoursWereNotReleased = json['workingHoursWereNotReleased']; - // beLate = json['beLate']; - // leaveEarly = json['leaveEarly']; - // noCardPunched = json['noCardPunched']; - // holidayInfo = json['holidayInfo']; + // buyRealNameTip = json['buyRealNameTip']; + // buyRealNameSelectYouWantBuyTip = json['buyRealNameSelectYouWantBuyTip']; + // forTheFirstTime = json['forTheFirstTime']; + // onceDay = json['onceDay']; + // weekOnce = json['weekOnce']; + // monthOnce = json['monthOnce']; - // lanEnglish = json['lanEnglish']; - // lanChinese = json['lanChinese']; - // multilingual = json['multilingual']; - // addLock = json['addLock']; - // lockAddress = json['lockAddress']; - // selectLockType = json['selectLockType']; - // videoIntercomDoorLock = json['videoIntercomDoorLock']; - // NFCPassiveLock = json['NFCPassiveLock']; - // addDevice = json['addDevice']; - // gateway = json['gateway']; - // message = json['message']; - supportStaff = json['supportStaff']; - set = json['set']; - moreServices = json['moreServices']; - - moreSet = json['moreSet']; - prompTone = json['prompTone']; - touchUnlock = json['touchUnlock']; - pushNotification = json['pushNotification']; - lockUserManagement = json['lockUserManagement']; - ownedKey = json['ownedKey']; - authorityManagement = json['authorityManagement']; - associatedDevice = json['associatedDevice']; - associatedName = json['associatedName']; - device = json['device']; - - authorizedAdmin = json['authorizedAdmin']; - addAuthorizedAdmin = json['addAuthorizedAdmin']; - lockGroup = json['lockGroup']; - transferSmartLock = json['transferSmartLock']; - selectiveLock = json['selectiveLock']; - recipientInformation = json['recipientInformation']; - transferGateway = json['transferGateway']; - - multiLanguage = json['multiLanguage']; - lockScreen = json['lockScreen']; - closed = json['closed']; - opened = json['opened']; - close = json['close']; - open = json['open']; - hideInvalidUnlockPermissions = json['hideInvalidUnlockPermissions']; - appUnlockRequiresMobilePhoneAccessToTheLock = - json['appUnlockRequiresMobilePhoneAccessToTheLock']; - valueAddedServices = json['valueAddedServices']; - about = json['about']; - userAgreement = json['userAgreement']; - privacyPolicy = json['privacyPolicy']; - personalInformationCollectionList = - json['personalInformationCollectionList']; - applicationPermissionDescription = json['applicationPermissionDescription']; - thirdPartyInformationSharingList = json['thirdPartyInformationSharingList']; - logout = json['logout']; - deleteAccount = json['deleteAccount']; - personalInformation = json['personalInformation']; - avatar = json['avatar']; - nickName = json['nickName']; - changeNickName = json['changeNickName']; - modifyAccount = json['modifyAccount']; - resetPasswords = json['resetPasswords']; - safetyProblem = json['safetyProblem']; - modifyAccountTip = json['modifyAccountTip']; - pleaseEnterAccountNumber = json['pleaseEnterAccountNumber']; - pleaseEnterNewAccountNumber = json['pleaseEnterNewAccountNumber']; - changeIphoneTip = json['changeIphoneTip']; - changeEmailTip = json['changeEmailTip']; - goBind = json['goBind']; - originalPassword = json['originalPassword']; - newPassword = json['newPassword']; - surePassword = json['surePassword']; - safetyProblemTip = json['safetyProblemTip']; - problemOne = json['problemOne']; - problemTwo = json['problemTwo']; - problemThree = json['problemThree']; - pleaseEnterYourAnswer = json['pleaseEnterYourAnswer']; - aboutToExpire = json['aboutToExpire']; - deAuthorize = json['deAuthorize']; - changeName = json['changeName']; - - designation = json['designation']; - state = json['state']; - wifiName = json['wifiName']; - networkMAC = json['networkMAC']; - gatewayUpgrade = json['gatewayUpgrade']; - gatewayConnectionLock = json['gatewayConnectionLock']; - strongSignal = json['strongSignal']; - mediumSignal = json['mediumSignal']; - averageSignal = json['averageSignal']; - weakSignal = json['weakSignal']; - selectGatewayType = json['selectGatewayType']; - addGateway = json['addGateway']; - turnThePowerBackOn = json['turnThePowerBackOn']; - indicatorLight = json['indicatorLight']; - selectGatewayTypeNextTip = json['selectGatewayTypeNextTip']; - selectGateway = json['selectGateway']; - gatewayConfigurationWifiTip = json['gatewayConfigurationWifiTip']; - wifiPassward = json['wifiPassward']; - pleaseEnterTheWiFiPassword = json['pleaseEnterTheWiFiPassword']; - gatewayName = json['gatewayName']; - pleaseEnterGatewayName = json['pleaseEnterGatewayName']; - gatewayName = json['gatewayName']; - pleaseEnterGatewayName = json['pleaseEnterGatewayName']; - wifiMAC = json['wifiMAC']; - ipAddress = json['ipAddress']; - subnetMask = json['subnetMask']; - defaultGateway = json['defaultGateway']; - automaticallyGetTheDNSServerAddress = - json['automaticallyGetTheDNSServerAddress']; - preferredDNS = json['preferredDNS']; - alternativeDNS = json['alternativeDNS']; - noStaticIPIsUsed = json['noStaticIPIsUsed']; - - allLock = json['allLock']; - searchAllLockType = json['searchAllLockType']; - doorLock = json['doorLock']; - padlock = json['padlock']; - safeLock = json['safeLock']; - intelligentLockCore = json['intelligentLockCore']; - itelligentAccessControl = json['itelligentAccessControl']; - parkingLock = json['parkingLock']; - bicycleLock = json['bicycleLock']; - longRangeControl = json['longRangeControl']; - lightTouchScreen = json['lightTouchScreen']; - lightTouchScreenTip = json['lightTouchScreenTip']; - next = json['next']; - nearbyLock = json['nearbyLock']; - addSuccessfullyPleaseRename = json['addSuccessfullyPleaseRename']; - whenAddingLockThePhoneMustBeNextToTheLock = - json['whenAddingLockThePhoneMustBeNextToTheLock']; - - login = json['login']; - register = json['register']; - forgetPassword = json['forgetPassword']; - readAndAgree = json['readAndAgree']; - verificationCode = json['verificationCode']; - registerPasswordTip = json['registerPasswordTip']; - iphone = json['iphone']; - email = json['email']; - mobileNumber = json['mobileNumber']; - countryAndRegion = json['countryAndRegion']; - select = json['select']; - - businessCooperation = json['businessCooperation']; - officialWebsite = json['officialWebsite']; - computerWebVersion = json['computerWebVersion']; - hotelSystem = json['hotelSystem']; - manualWebVersion = json['manualWebVersion']; - introduce = json['introduce']; - - note = json['note']; - mail = json['mail']; - advancedFunction = json['advancedFunction']; - pushMessage = json['pushMessage']; - recordsRetention = json['recordsRetention']; - - smsBuyTip = json['smsBuyTip']; - emailBuyTip = json['emailBuyTip']; - currentRemainingQuantity = json['currentRemainingQuantity']; - buy = json['buy']; - customSMSTemplate = json['customSMSTemplate']; - customMailTemplate = json['customMailTemplate']; - record = json['record']; - - buyRealNameTip = json['buyRealNameTip']; - buyRealNameSelectYouWantBuyTip = json['buyRealNameSelectYouWantBuyTip']; - forTheFirstTime = json['forTheFirstTime']; - onceDay = json['onceDay']; - weekOnce = json['weekOnce']; - monthOnce = json['monthOnce']; - - currentState = json['currentState']; - onTrial = json['onTrial']; - haveNotOpened = json['haveNotOpened']; - advancedFeaturesAndBenefitsContent = - json['advancedFeaturesAndBenefitsContent']; - smsTemplate = json['smsTemplate']; - emailTemplate = json['emailTemplate']; - cardIssuingtool = json['cardIssuingtool']; - titleForBuyingAdvancedFeatures = json['titleForBuyingAdvancedFeatures']; - tipsForBuyingAdvancedFeatures = json['tipsForBuyingAdvancedFeatures']; - freeTrial = json['freeTrial']; - openNow = json['openNow']; + // currentState = json['currentState']; + // onTrial = json['onTrial']; + // haveNotOpened = json['haveNotOpened']; + // advancedFeaturesAndBenefitsContent = json['advancedFeaturesAndBenefitsContent']; + // smsTemplate = json['smsTemplate']; + // emailTemplate = json['emailTemplate']; + // cardIssuingtool = json['cardIssuingtool']; + // titleForBuyingAdvancedFeatures = json['titleForBuyingAdvancedFeatures']; + // tipsForBuyingAdvancedFeatures = json['tipsForBuyingAdvancedFeatures']; + // freeTrial = json['freeTrial']; + // openNow = json['openNow']; buySMS = json['buySMS']; buyMail = json['buyMail']; @@ -874,7 +222,7 @@ class LanKeyEntity { appUnlockRequiresMobilePhoneAccessToTheLockTip = json['appUnlockRequiresMobilePhoneAccessToTheLockTip']; checkAll = json['checkAll']; - getVerificationCode = json['getVerificationCode']; + // getVerificationCode = json['getVerificationCode']; configuringWiFi = json['configuringWiFi']; pleaseEnterWifiName = json['pleaseEnterWifiName']; @@ -968,373 +316,48 @@ class LanKeyEntity { permissionDialogGoSetUp = json['permission_dialog_go_set_up']; } - // String? starLock; - // String? clickUnlockAndHoldDownClose; - // String? checkingIn; - // String? electronicKey; - // String? password; - // String? card; - // String? fingerprint; - // String? remoteControl; - // String? face; - // String? operatingRecord; - // String? doorLockLog; - // String? number; - // String? additive; - // String? addTime; - // String? reset; - // String? sendKey; - // String? timeLimit; - // String? permanent; - // String? once; - // String? circulation; - // String? receiver; - // String? pleaseEnterNumberOrEmail; - // String? name; - // String? enterYourName; - // String? effectiveTime; - // String? failureTime; - // String? effectiveDate; - // String? failureDate; - // String? monday; - // String? tuesday; - // String? wednesday; - // String? thursday; - // String? friday; - // String? saturday; - // String? sunday; + // String? select; - // String? mondayShort; - // String? tuesdayShort; - // String? wednesdayShort; - // String? thursdayShort; - // String? fridayShort; - // String? saturdayShort; - // String? sundayShort; + // String? businessCooperation; + // String? officialWebsite; + // String? computerWebVersion; + // String? hotelSystem; + // String? manualWebVersion; + // String? introduce; - // String? realNameAuthentication; - // String? sendKeyBottomTip; - // String? send; - // String? periodValidity; - // String? sendGroupKey; - // String? lock; - // String? pleaseAdd; - // String? pleaseSelect; - // String? remoteUnlockingAllowed; - // String? pleaseEnter; - // String? getPassword; - // String? custom; - // String? clearAll; - // String? recursiveDevice; - // String? pleaseNameYourPassword; - // String? pleaseEnterDigitsNumber; - // String? getPasswordTip1; - // String? getPasswordTip2; - // String? getPasswordTip3; - // String? getPasswordTip4; - // String? getPasswordTip5; - // String? getPasswordTip6; - // String? getTip; - // String? addTip; - // String? sender; - // String? senderTime; - // String? keyDetail; - // String? detail; - // String? delete; - // String? passwordDetail; - // String? share; - // String? amend; - // String? sure; - // String? cancel; - // String? add; - // String? accountNumber; - // String? volumeAuthorizationLock; - // String? authorizedAdminTip; - // String? lockOperatingRecordTip; - // String? remoteUnlockingPageTip; - // String? currentMode; - // String? delayTime; - // String? automaticBlockingTip; - // String? time; - // String? normallyOpen; - // String? date; - // String? begin; - // String? end; - // String? allDay; - // String? save; - // String? normallyOpenModeTip; - // String? pleaseSelectLockVolume; - // String? lockSoundTip; - // String? low; - // String? lower; - // String? medium; - // String? high; - // String? higher; - // String? burglarAlarmTip; - // String? resetButtonTip1; - // String? resetButtonTip2; - // String? calibrationTime; - // String? setTheDSTMode; - // String? diagnoseTip; - // String? uploading; - // String? uploadDataTip; - // String? importOtherLockDataTip; - // String? haveNewVersion; - // String? currentVersion; - // String? newVersion; - // String? upgrade; - // String? leisure; - // String? checkedIn; - // String? rankingList; - // String? earlyArrivalList; - // String? lateList; - // String? hardWorkingList; - // String? company; - // String? staff; - // String? work; - // String? workday; - // String? holidays; - // String? punchingMode; - // String? whetherTheEmployeeHasAKey; - // String? selectKey; - // String? officeHours; - // String? closingTime; - // String? thisWeek; - // String? singleDayWeekend; - // String? twoDaysOff; - // String? oddOrEvenDaysOff; - // String? year; - // String? month; - // String? libertyDay; - // String? coverDate; - // String? addedHoliday; - // String? startDate; - // String? accessDate; - // String? mustFillIn; - // String? endDate; - // String? dailyCharts; - // String? monthlyLeaderboard; - // String? noAttendanceRecord; - // String? everyoneIsVeryMotivated; - // String? workingHoursWereNotReleased; - // String? beLate; - // String? leaveEarly; - // String? noCardPunched; - // String? holidayInfo; + // String? note; + // String? mail; + // String? advancedFunction; + // String? pushMessage; + // String? recordsRetention; - // String? basicInformation; - // String? wirelessKeyboard; - // String? doorMagnetic; - // String? remoteUnlocking; - // String? automaticBlocking; - // String? normallyOpenMode; - // String? automaticUnLock; - // String? automaticUnLockTip; - // String? lockSound; - // String? burglarAlarm; - // String? resetButton; - // String? lockTime; - // String? diagnose; - // String? uploadData; - // String? importOtherLockData; - // String? lockEscalation; - // String? markedHouseState; - // String? unlockReminder; - // String? unlockQRCode; - // String? lockNumber; - // String? electricQuantity; - // String? lockName; - // String? lockGrouping; - // String? adminOpenLockPassword; - // String? update; - // String? updateElectricQuantityTip; - // String? adminOpenLockPasswordTip; - // String? updateLockAdminPassword; - // String? whenScreenFlashesClickNext; - // String? theScreenNeverFlickered; - // String? enterNumberOrPressSet; - // String? theLocationOfTheSetKeyWillBeDifferent; - // String? pressAndHoldTheResetButtonTwoSeconds; - // String? nearbyEquipment; - // String? noData; - // String? doorMagneticListTopTip; + // String? smsBuyTip; + // String? emailBuyTip; + // String? currentRemainingQuantity; + // String? buy; + // String? customSMSTemplate; + // String? customMailTemplate; + // String? record; - // String? lanEnglish; - // String? lanChinese; - // String? multilingual; - // String? addLock; - // String? lockAddress; - // String? selectLockType; - // String? videoIntercomDoorLock; - // String? NFCPassiveLock; - // String? addDevice; - // String? gateway; - // String? message; - String? supportStaff; - String? set; - String? moreServices; + // String? buyRealNameTip; + // String? buyRealNameSelectYouWantBuyTip; + // String? forTheFirstTime; + // String? onceDay; + // String? weekOnce; + // String? monthOnce; - String? moreSet; - String? prompTone; - String? touchUnlock; - String? pushNotification; - String? lockUserManagement; - String? ownedKey; - String? authorityManagement; - String? associatedDevice; - String? associatedName; - String? device; - String? authorizedAdmin; - String? addAuthorizedAdmin; - String? lockGroup; - // String? selectGroup; - // String? createNewGroup; - String? transferSmartLock; - String? selectiveLock; - String? recipientInformation; - String? transferGateway; - - String? multiLanguage; - String? lockScreen; - String? closed; - String? opened; - String? close; - String? open; - String? hideInvalidUnlockPermissions; - String? appUnlockRequiresMobilePhoneAccessToTheLock; - String? valueAddedServices; - String? about; - String? userAgreement; - String? privacyPolicy; - String? personalInformationCollectionList; - String? applicationPermissionDescription; - String? thirdPartyInformationSharingList; - String? logout; - String? deleteAccount; - String? personalInformation; - String? avatar; - String? nickName; - String? changeNickName; - String? modifyAccount; - String? resetPasswords; - String? safetyProblem; - String? modifyAccountTip; - String? pleaseEnterAccountNumber; - String? pleaseEnterNewAccountNumber; - String? changeIphoneTip; - String? changeEmailTip; - String? goBind; - String? originalPassword; - String? newPassword; - String? surePassword; - String? safetyProblemTip; - String? problemOne; - String? problemTwo; - String? problemThree; - String? pleaseEnterYourAnswer; - String? aboutToExpire; - String? deAuthorize; - String? changeName; - - String? designation; - String? state; - String? wifiName; - String? networkMAC; - String? gatewayUpgrade; - String? gatewayConnectionLock; - String? strongSignal; - String? mediumSignal; - String? averageSignal; - String? weakSignal; - String? selectGatewayType; - String? addGateway; - String? turnThePowerBackOn; - String? indicatorLight; - String? selectGatewayTypeNextTip; - String? selectGateway; - String? gatewayConfigurationWifiTip; - String? wifiPassward; - String? pleaseEnterTheWiFiPassword; - String? gatewayName; - String? pleaseEnterGatewayName; - String? wifiMAC; - String? ipAddress; - String? subnetMask; - String? defaultGateway; - String? automaticallyGetTheDNSServerAddress; - String? preferredDNS; - String? alternativeDNS; - String? noStaticIPIsUsed; - - String? allLock; - String? searchAllLockType; - String? doorLock; - String? padlock; - String? safeLock; - String? intelligentLockCore; - String? itelligentAccessControl; - String? parkingLock; - String? bicycleLock; - String? longRangeControl; - String? lightTouchScreen; - String? lightTouchScreenTip; - String? next; - String? nearbyLock; - String? addSuccessfullyPleaseRename; - String? whenAddingLockThePhoneMustBeNextToTheLock; - - String? login; - String? register; - String? forgetPassword; - String? readAndAgree; - String? verificationCode; - String? registerPasswordTip; - String? iphone; - String? email; - String? mobileNumber; - String? countryAndRegion; - String? select; - - String? businessCooperation; - String? officialWebsite; - String? computerWebVersion; - String? hotelSystem; - String? manualWebVersion; - String? introduce; - - String? note; - String? mail; - String? advancedFunction; - String? pushMessage; - String? recordsRetention; - - String? smsBuyTip; - String? emailBuyTip; - String? currentRemainingQuantity; - String? buy; - String? customSMSTemplate; - String? customMailTemplate; - String? record; - - String? buyRealNameTip; - String? buyRealNameSelectYouWantBuyTip; - String? forTheFirstTime; - String? onceDay; - String? weekOnce; - String? monthOnce; - - String? currentState; - String? onTrial; - String? haveNotOpened; - String? advancedFeaturesAndBenefitsContent; - String? smsTemplate; - String? emailTemplate; - String? cardIssuingtool; - String? titleForBuyingAdvancedFeatures; - String? tipsForBuyingAdvancedFeatures; - String? freeTrial; - String? openNow; + // String? currentState; + // String? onTrial; + // String? haveNotOpened; + // String? advancedFeaturesAndBenefitsContent; + // String? smsTemplate; + // String? emailTemplate; + // String? cardIssuingtool; + // String? titleForBuyingAdvancedFeatures; + // String? tipsForBuyingAdvancedFeatures; + // String? freeTrial; + // String? openNow; String? buySMS; String? buyMail; @@ -1371,7 +394,7 @@ class LanKeyEntity { String? hideInvalidUnlockPermissionsTip; String? appUnlockRequiresMobilePhoneAccessToTheLockTip; String? checkAll; - String? getVerificationCode; + // String? getVerificationCode; String? configuringWiFi; String? pleaseEnterWifiName; @@ -1465,379 +488,48 @@ class LanKeyEntity { Map toJson() { final map = {}; - // map['starLock'] = starLock; - // map['clickUnlockAndHoldDownClose'] = clickUnlockAndHoldDownClose; - // map['checkingIn'] = checkingIn; - // map['electronicKey'] = electronicKey; - // map['password'] = password; - // map['card'] = card; - // map['fingerprint'] = fingerprint; - // map['remoteControl'] = remoteControl; - // map['face'] = face; - // map['operatingRecord'] = operatingRecord; - // map['doorLockLog'] = doorLockLog; - // map['number'] = number; - // map['additive'] = additive; - // map['addTime'] = addTime; - // map['reset'] = reset; - // map['sendKey'] = sendKey; - // map['timeLimit'] = timeLimit; - // map['permanent'] = permanent; - // map['once'] = once; - // map['circulation'] = circulation; - // map['receiver'] = receiver; - // map['pleaseEnterNumberOrEmail'] = pleaseEnterNumberOrEmail; - // map['name'] = name; - // map['enterYourName'] = enterYourName; - // map['effectiveTime'] = effectiveTime; - // map['failureTime'] = failureTime; - // map['effectiveDate'] = effectiveDate; - // map['failureDate'] = failureDate; - // map['monday'] = monday; - // map['tuesday'] = tuesday; - // map['wednesday'] = wednesday; - // map['thursday'] = thursday; - // map['friday'] = friday; - // map['saturday'] = saturday; - // map['sunday'] = sunday; + // map['select'] = select; - // map['mondayShort'] = mondayShort; - // map['tuesdayShort'] = tuesdayShort; - // map['wednesdayShort'] = wednesdayShort; - // map['thursdayShort'] = thursdayShort; - // map['fridayShort'] = fridayShort; - // map['saturdayShort'] = saturdayShort; - // map['sundayShort'] = sundayShort; + // map['businessCooperation'] = businessCooperation; + // map['officialWebsite'] = officialWebsite; + // map['computerWebVersion'] = computerWebVersion; + // map['hotelSystem'] = hotelSystem; + // map['manualWebVersion'] = manualWebVersion; + // map['introduce'] = introduce; - // map['realNameAuthentication'] = realNameAuthentication; - // map['sendKeyBottomTip'] = sendKeyBottomTip; - // map['send'] = send; - // map['periodValidity'] = periodValidity; - // map['sendGroupKey'] = sendGroupKey; - // map['lock'] = lock; - // map['pleaseAdd'] = pleaseAdd; - // map['pleaseSelect'] = pleaseSelect; - // map['remoteUnlockingAllowed'] = remoteUnlockingAllowed; - // map['pleaseEnter'] = pleaseEnter; - // map['getPassword'] = getPassword; + // map['note'] = note; + // map['mail'] = mail; + // map['advancedFunction'] = advancedFunction; + // map['pushMessage'] = pushMessage; + // map['recordsRetention'] = recordsRetention; - // map['custom'] = custom; - // map['clearAll'] = clearAll; - // map['recursiveDevice'] = recursiveDevice; - // map['pleaseNameYourPassword'] = pleaseNameYourPassword; - // map['pleaseEnterDigitsNumber'] = pleaseEnterDigitsNumber; - // map['getPasswordTip1'] = getPasswordTip1; - // map['getPasswordTip2'] = getPasswordTip2; - // map['getPasswordTip3'] = getPasswordTip3; - // map['getPasswordTip4'] = getPasswordTip4; - // map['getPasswordTip5'] = getPasswordTip5; - // map['getPasswordTip6'] = getPasswordTip6; - // map['getTip'] = getTip; - // map['addTip'] = addTip; - // map['sender'] = sender; - // map['senderTime'] = senderTime; - // map['keyDetail'] = keyDetail; - // map['detail'] = detail; - // map['delete'] = delete; - // map['passwordDetail'] = passwordDetail; - // map['share'] = share; - // map['amend'] = amend; - // map['sure'] = sure; - // map['cancel'] = cancel; - // map['add'] = add; - // map['accountNumber'] = accountNumber; - // map['volumeAuthorizationLock'] = volumeAuthorizationLock; - // map['authorizedAdminTip'] = authorizedAdminTip; - // map['lockOperatingRecordTip'] = lockOperatingRecordTip; - // map['remoteUnlockingPageTip'] = remoteUnlockingPageTip; + // map['smsBuyTip'] = smsBuyTip; + // map['emailBuyTip'] = emailBuyTip; + // map['currentRemainingQuantity'] = currentRemainingQuantity; + // map['buy'] = buy; + // map['customSMSTemplate'] = customSMSTemplate; + // map['customMailTemplate'] = customMailTemplate; + // map['record'] = record; - // map['currentMode'] = currentMode; - // map['delayTime'] = delayTime; - // map['automaticBlockingTip'] = automaticBlockingTip; - // map['time'] = time; - // map['normallyOpen'] = normallyOpen; - // map['date'] = date; - // map['begin'] = begin; - // map['end'] = end; - // map['allDay'] = allDay; - // map['save'] = save; - // map['normallyOpenModeTip'] = normallyOpenModeTip; - // map['pleaseSelectLockVolume'] = pleaseSelectLockVolume; - // map['lockSoundTip'] = lockSoundTip; - // map['low'] = low; - // map['lower'] = lower; - // map['medium'] = medium; - // map['high'] = high; - // map['higher'] = higher; - // map['burglarAlarmTip'] = burglarAlarmTip; - // map['resetButtonTip1'] = resetButtonTip1; - // map['resetButtonTip2'] = resetButtonTip2; - // map['calibrationTime'] = calibrationTime; - // map['setTheDSTMode'] = setTheDSTMode; - // map['diagnoseTip'] = diagnoseTip; - // map['uploading'] = uploading; - // map['uploadDataTip'] = uploadDataTip; - // map['importOtherLockDataTip'] = importOtherLockDataTip; - // map['haveNewVersion'] = haveNewVersion; - // map['currentVersion'] = currentVersion; - // map['newVersion'] = newVersion; - // map['upgrade'] = upgrade; - // map['leisure'] = leisure; - // map['checkedIn'] = checkedIn; - // map['rankingList'] = rankingList; - // map['earlyArrivalList'] = earlyArrivalList; - // map['lateList'] = lateList; - // map['hardWorkingList'] = hardWorkingList; + // map['buyRealNameTip'] = buyRealNameTip; + // map['buyRealNameSelectYouWantBuyTip'] = buyRealNameSelectYouWantBuyTip; + // map['forTheFirstTime'] = forTheFirstTime; + // map['onceDay'] = onceDay; + // map['weekOnce'] = weekOnce; + // map['monthOnce'] = monthOnce; - // map['basicInformation'] = basicInformation; - // map['wirelessKeyboard'] = wirelessKeyboard; - // map['doorMagnetic'] = doorMagnetic; - // map['remoteUnlocking'] = remoteUnlocking; - // map['automaticBlocking'] = automaticBlocking; - // map['normallyOpenMode'] = normallyOpenMode; - // map['automaticUnLock'] = automaticUnLock; - // map['automaticUnLockTip'] = automaticUnLockTip; - // map['lockSound'] = lockSound; - // map['burglarAlarm'] = burglarAlarm; - // map['resetButton'] = resetButton; - // map['lockTime'] = lockTime; - // map['diagnose'] = diagnose; - // map['uploadData'] = uploadData; - // map['importOtherLockData'] = importOtherLockData; - // map['lockEscalation'] = lockEscalation; - // map['markedHouseState'] = markedHouseState; - // map['unlockReminder'] = unlockReminder; - // map['unlockQRCode'] = unlockQRCode; - // map['lockNumber'] = lockNumber; - // map['electricQuantity'] = electricQuantity; - // map['lockName'] = lockName; - // map['lockGrouping'] = lockGrouping; - // map['adminOpenLockPassword'] = adminOpenLockPassword; - // map['update'] = update; - // map['updateElectricQuantityTip'] = updateElectricQuantityTip; - // map['adminOpenLockPasswordTip'] = adminOpenLockPasswordTip; - // map['updateLockAdminPassword'] = updateLockAdminPassword; - // map['whenScreenFlashesClickNext'] = whenScreenFlashesClickNext; - // map['theScreenNeverFlickered'] = theScreenNeverFlickered; - // map['enterNumberOrPressSet'] = enterNumberOrPressSet; - // map['theLocationOfTheSetKeyWillBeDifferent'] = theLocationOfTheSetKeyWillBeDifferent; - // map['pressAndHoldTheResetButtonTwoSeconds'] = pressAndHoldTheResetButtonTwoSeconds; - // map['nearbyEquipment'] = nearbyEquipment; - // map['noData'] = noData; - // map['doorMagneticListTopTip'] = doorMagneticListTopTip; - // map['company'] = company; - // map['staff'] = staff; - // map['work'] = work; - // map['workday'] = workday; - // map['holidays'] = holidays; - // map['punchingMode'] = punchingMode; - // map['whetherTheEmployeeHasAKey'] = whetherTheEmployeeHasAKey; - // map['selectKey'] = selectKey; - // map['officeHours'] = officeHours; - // map['closingTime'] = closingTime; - // map['thisWeek'] = thisWeek; - // map['singleDayWeekend'] = singleDayWeekend; - // map['twoDaysOff'] = twoDaysOff; - // map['oddOrEvenDaysOff'] = oddOrEvenDaysOff; - // map['year'] = year; - // map['month'] = month; - // map['libertyDay'] = libertyDay; - // map['coverDate'] = coverDate; - // map['addedHoliday'] = addedHoliday; - // map['startDate'] = startDate; - // map['accessDate'] = accessDate; - // map['mustFillIn'] = mustFillIn; - // map['endDate'] = endDate; - // map['dailyCharts'] = dailyCharts; - // map['monthlyLeaderboard'] = monthlyLeaderboard; - // map['noAttendanceRecord'] = noAttendanceRecord; - // map['everyoneIsVeryMotivated'] = everyoneIsVeryMotivated; - // map['workingHoursWereNotReleased'] = workingHoursWereNotReleased; - // map['beLate'] = beLate; - // map['leaveEarly'] = leaveEarly; - // map['noCardPunched'] = noCardPunched; - // map['holidayInfo'] = holidayInfo; - - // map['lanEnglish'] = lanEnglish; - // map['lanChinese'] = lanChinese; - // map['multilingual'] = multilingual; - // map['addLock'] = addLock; - // map['lockAddress'] = lockAddress; - // map['selectLockType'] = selectLockType; - // map['videoIntercomDoorLock'] = videoIntercomDoorLock; - // map['NFCPassiveLock'] = NFCPassiveLock; - // map['addDevice'] = addDevice; - // map['gateway'] = gateway; - // map['message'] = message; - map['supportStaff'] = supportStaff; - map['set'] = set; - map['moreServices'] = moreServices; - - map['moreSet'] = moreSet; - map['prompTone'] = prompTone; - map['touchUnlock'] = touchUnlock; - map['pushNotification'] = pushNotification; - map['lockUserManagement'] = lockUserManagement; - map['ownedKey'] = ownedKey; - map['authorityManagement'] = authorityManagement; - map['associatedDevice'] = associatedDevice; - map['associatedName'] = associatedName; - map['device'] = device; - map['authorizedAdmin'] = authorizedAdmin; - map['addAuthorizedAdmin'] = addAuthorizedAdmin; - map['lockGroup'] = lockGroup; - map['transferSmartLock'] = transferSmartLock; - map['selectiveLock'] = selectiveLock; - map['recipientInformation'] = recipientInformation; - map['transferGateway'] = transferGateway; - - map['multiLanguage'] = multiLanguage; - map['lockScreen'] = lockScreen; - map['closed'] = closed; - map['opened'] = opened; - map['close'] = close; - map['open'] = open; - map['hideInvalidUnlockPermissions'] = hideInvalidUnlockPermissions; - map['appUnlockRequiresMobilePhoneAccessToTheLock'] = - appUnlockRequiresMobilePhoneAccessToTheLock; - map['valueAddedServices'] = valueAddedServices; - map['about'] = about; - map['userAgreement'] = userAgreement; - map['privacyPolicy'] = privacyPolicy; - map['personalInformationCollectionList'] = - personalInformationCollectionList; - map['applicationPermissionDescription'] = applicationPermissionDescription; - map['thirdPartyInformationSharingList'] = thirdPartyInformationSharingList; - map['logout'] = logout; - map['deleteAccount'] = deleteAccount; - map['personalInformation'] = personalInformation; - map['avatar'] = avatar; - map['nickName'] = nickName; - map['changeNickName'] = changeNickName; - map['modifyAccount'] = modifyAccount; - map['resetPasswords'] = resetPasswords; - map['safetyProblem'] = safetyProblem; - map['safetyProblem'] = safetyProblem; - map['modifyAccountTip'] = modifyAccountTip; - map['pleaseEnterAccountNumber'] = pleaseEnterAccountNumber; - map['pleaseEnterNewAccountNumber'] = pleaseEnterNewAccountNumber; - map['changeIphoneTip'] = changeIphoneTip; - map['changeEmailTip'] = changeEmailTip; - map['goBind'] = goBind; - map['originalPassword'] = originalPassword; - map['newPassword'] = newPassword; - map['surePassword'] = surePassword; - map['safetyProblemTip'] = safetyProblemTip; - map['problemOne'] = problemOne; - map['problemTwo'] = problemTwo; - map['problemThree'] = problemThree; - map['pleaseEnterYourAnswer'] = pleaseEnterYourAnswer; - map['aboutToExpire'] = aboutToExpire; - map['deAuthorize'] = deAuthorize; - map['changeName'] = changeName; - - map['designation'] = designation; - map['state'] = state; - map['wifiName'] = wifiName; - map['networkMAC'] = networkMAC; - map['gatewayUpgrade'] = gatewayUpgrade; - map['gatewayConnectionLock'] = gatewayConnectionLock; - map['strongSignal'] = strongSignal; - map['mediumSignal'] = mediumSignal; - map['averageSignal'] = averageSignal; - map['weakSignal'] = weakSignal; - map['selectGatewayType'] = selectGatewayType; - map['addGateway'] = addGateway; - map['turnThePowerBackOn'] = turnThePowerBackOn; - map['indicatorLight'] = indicatorLight; - map['selectGatewayTypeNextTip'] = selectGatewayTypeNextTip; - map['selectGateway'] = selectGateway; - map['gatewayConfigurationWifiTip'] = gatewayConfigurationWifiTip; - map['wifiPassward'] = wifiPassward; - map['pleaseEnterTheWiFiPassword'] = pleaseEnterTheWiFiPassword; - map['gatewayName'] = gatewayName; - map['pleaseEnterGatewayName'] = pleaseEnterGatewayName; - map['wifiMAC'] = wifiMAC; - map['ipAddress'] = ipAddress; - map['subnetMask'] = subnetMask; - map['defaultGateway'] = defaultGateway; - map['automaticallyGetTheDNSServerAddress'] = - automaticallyGetTheDNSServerAddress; - map['preferredDNS'] = preferredDNS; - map['alternativeDNS'] = alternativeDNS; - map['noStaticIPIsUsed'] = noStaticIPIsUsed; - - map['allLock'] = allLock; - map['searchAllLockType'] = searchAllLockType; - map['doorLock'] = doorLock; - map['padlock'] = padlock; - map['safeLock'] = safeLock; - map['intelligentLockCore'] = intelligentLockCore; - map['itelligentAccessControl'] = itelligentAccessControl; - map['parkingLock'] = parkingLock; - map['bicycleLock'] = bicycleLock; - map['longRangeControl'] = longRangeControl; - map['lightTouchScreen'] = lightTouchScreen; - map['lightTouchScreenTip'] = lightTouchScreenTip; - map['next'] = next; - map['nearbyLock'] = nearbyLock; - map['addSuccessfullyPleaseRename'] = addSuccessfullyPleaseRename; - map['whenAddingLockThePhoneMustBeNextToTheLock'] = - whenAddingLockThePhoneMustBeNextToTheLock; - - map['login'] = login; - map['register'] = register; - map['forgetPassword'] = forgetPassword; - map['readAndAgree'] = readAndAgree; - map['verificationCode'] = verificationCode; - map['registerPasswordTip'] = registerPasswordTip; - map['iphone'] = iphone; - map['email'] = email; - map['mobileNumber'] = mobileNumber; - map['countryAndRegion'] = countryAndRegion; - map['select'] = select; - - map['businessCooperation'] = businessCooperation; - map['officialWebsite'] = officialWebsite; - map['computerWebVersion'] = computerWebVersion; - map['hotelSystem'] = hotelSystem; - map['manualWebVersion'] = manualWebVersion; - map['introduce'] = introduce; - - map['note'] = note; - map['mail'] = mail; - map['advancedFunction'] = advancedFunction; - map['pushMessage'] = pushMessage; - map['recordsRetention'] = recordsRetention; - - map['smsBuyTip'] = smsBuyTip; - map['emailBuyTip'] = emailBuyTip; - map['currentRemainingQuantity'] = currentRemainingQuantity; - map['buy'] = buy; - map['customSMSTemplate'] = customSMSTemplate; - map['customMailTemplate'] = customMailTemplate; - map['record'] = record; - - map['buyRealNameTip'] = buyRealNameTip; - map['buyRealNameSelectYouWantBuyTip'] = buyRealNameSelectYouWantBuyTip; - map['forTheFirstTime'] = forTheFirstTime; - map['onceDay'] = onceDay; - map['weekOnce'] = weekOnce; - map['monthOnce'] = monthOnce; - - map['currentState'] = currentState; - map['onTrial'] = onTrial; - map['haveNotOpened'] = haveNotOpened; - map['advancedFeaturesAndBenefitsContent'] = - advancedFeaturesAndBenefitsContent; - map['smsTemplate'] = smsTemplate; - map['emailTemplate'] = emailTemplate; - map['cardIssuingtool'] = cardIssuingtool; - map['titleForBuyingAdvancedFeatures'] = titleForBuyingAdvancedFeatures; - map['tipsForBuyingAdvancedFeatures'] = tipsForBuyingAdvancedFeatures; - map['freeTrial'] = freeTrial; - map['openNow'] = openNow; + // map['currentState'] = currentState; + // map['onTrial'] = onTrial; + // map['haveNotOpened'] = haveNotOpened; + // map['advancedFeaturesAndBenefitsContent'] = advancedFeaturesAndBenefitsContent; + // map['smsTemplate'] = smsTemplate; + // map['emailTemplate'] = emailTemplate; + // map['cardIssuingtool'] = cardIssuingtool; + // map['titleForBuyingAdvancedFeatures'] = titleForBuyingAdvancedFeatures; + // map['tipsForBuyingAdvancedFeatures'] = tipsForBuyingAdvancedFeatures; + // map['freeTrial'] = freeTrial; + // map['openNow'] = openNow; map['buySMS'] = buySMS; map['buyMail'] = buyMail; @@ -1876,7 +568,7 @@ class LanKeyEntity { map['appUnlockRequiresMobilePhoneAccessToTheLockTip'] = appUnlockRequiresMobilePhoneAccessToTheLockTip; map['checkAll'] = checkAll; - map['getVerificationCode'] = getVerificationCode; + // map['getVerificationCode'] = getVerificationCode; map['configuringWiFi'] = configuringWiFi; map['pleaseEnterWifiName'] = pleaseEnterWifiName;