From c4c95eaa59ac6f05a83c1b037e5d49429d5065a8 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Mon, 13 May 2024 14:08:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=20ota=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 8 +- star_lock/images/lan/lan_keys.json | 8 +- star_lock/images/lan/lan_zh.json | 1154 ++++++++--------- star_lock/lib/blue/blue_manage.dart | 15 +- star_lock/lib/blue/io_reply.dart | 4 +- .../lockDetail/lockDetail_logic.dart | 5 +- .../lockEscalation/lockEscalation_logic.dart | 14 +- .../lockEscalation/lockEscalation_page.dart | 283 ++-- .../mine/addLock/saveLock/saveLock_page.dart | 72 +- .../mine/addLock/saveLock/saveLock_state.dart | 12 +- 10 files changed, 800 insertions(+), 775 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 90eb2734..f674371d 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -833,5 +833,11 @@ "姓名":"Name", "发送":"Send", "请确认姓名全名和身份证号码是否正确":"Please confirm that the full name and ID number are correct", - "传输期间请勿离开当前页面":"Do not leave the current page during transfer" + "传输期间请勿离开当前页面":"Do not leave the current page during transfer", + "机型": "models", + "硬件版本": "Hardware version", + "固件版本": "Firmware version", + "手动升级": "Manual upgrade", + "设备连接中...": "Device Connecting...", + "升级过程中无法开锁，请先开锁后再升级": "The lock cannot be unlocked during the upgrade, please unlock the lock before upgrading" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index 7aaa9d43..e8d93bfa 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -861,5 +861,11 @@ "姓名":"姓名", "发送":"发送", "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确", - "传输期间请勿离开当前页面":"传输期间请勿离开当前页面" + "传输期间请勿离开当前页面":"传输期间请勿离开当前页面", + "机型": "机型", + "硬件版本": "硬件版本", + "固件版本": "固件版本", + "手动升级": "手动升级", + "设备连接中...": "设备连接中...", + "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 42188044..951ad37d 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -1,273 +1,267 @@ { - "starLock":"星锁", - "lockThrough":"锁通通", - "clickUnlockAndHoldDownClose":"点击开锁，长按闭锁", - "checkingIn":"考勤", - "electronicKey":"电子钥匙", - "password":"密码", - "card":"卡", - "fingerprint":"指纹", - "remoteControl":"遥控", - "face":"人脸", - "operatingRecord":"操作记录", - "doorLockLog":"门锁日志", - "number":"号", - "additive":"添加者", - "addTime":"添加时间", - - "reset":"重置", - "sendKey":"发送钥匙", - "timeLimit":"限时", - "permanent":"永久", - "once":"单次", - "circulation":"循环", - "receiver":"接收者", - "pleaseEnterNumberOrEmail":"请输入手机号或者邮箱", - "name":"姓名", - "enterYourName":"请输入姓名", - "effectiveTime":"生效时间", - "failureTime":"失效时间", - "effectiveDate":"生效日期", - "failureDate":"失效日期", - "monday":"星期一", - "tuesday":"星期二", - "wednesday":"星期三", - "thursday":"星期四", - "friday":"星期五", - "saturday":"星期六", - "sunday":"星期日", - "mondayShort":"一", - "tuesdayShort":"二", - "wednesdayShort":"三", - "thursdayShort":"四", - "fridayShort":"五", - "saturdayShort":"六", - "sundayShort":"日", - - "realNameAuthentication":"实名认证", - "sendKeyBottomTip":"接收者在有效期内可以不限次数使用", - "send":"发送", - "periodValidity":"有效期", - "sendGroupKey":"群发钥匙", - "lock":"锁", - "pleaseAdd":"请添加", - "pleaseSelect":"请选择", - "remoteUnlockingAllowed":"允许远程开锁", - "pleaseEnter":"请输入", - "getPassword":"获取密码", - "custom":"自定义", - "clearAll":"清空", - "recursiveDevice":"循环方式", - "pleaseNameYourPassword":"请给密码命名", - "pleaseEnterDigitsNumber":"请输入6-9位数字", - "getPasswordTip1":"密码在24小时内至少要使用过一次，否则将无效", - "getPasswordTip2":"限时密码可以在有效期内不限次数使用 \n密码在生效后的24小时内至少要使用过一次，否则将失效", - "getPasswordTip3":"密码有限期为6个小时，只能使用一次", - "getPasswordTip4":"手动输入6-9位数字作为密码。可在锁旁边通过手机蓝牙添加，也可以通过网关远程添加", - "getPasswordTip5":"限时密码可以再有下期内不限次数使用 \n密码在生效后的24小时内至少要使用过一次,否则将失效", - "getPasswordTip6":"密码有效期为24小时，在锁上输入后，将使之前使用过的密码都失效", - "getTip":"获取", - "addTip":"添加", - "sender":"发送人", - "senderTime":"发送时间", - "keyDetail":"钥匙详情", - "detail":"详情", - "delete":"删除", - "passwordDetail":"密码详情", - "share":"分享", - "amend":"修改", - "sure":"确定", - "cancel":"取消", - "add":"添加", - "accountNumber":"账号", - "volumeAuthorizationLock":"批量授权锁", - "authorizedAdminTip":"授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人", - "lockOperatingRecordTip":"只能保留一定时间内的记录，如果您需要保留历史记录，可以在右上角导出", - "rankingList":"排列榜", - "earlyArrivalList":"早到榜", - "lateList":"迟到榜", - "hardWorkingList":"勤奋榜", - "company":"公司", - "staff":"员工", - "work":"工作", - "workday":"工作日", - "holidays":"节假日", - "punchingMode":"打卡方式", - "whetherTheEmployeeHasAKey":"员工是否有钥匙", - "selectKey":"选择钥匙", - "officeHours":"上班时间", - "closingTime":"下班时间", - "thisWeek":"本周", - "singleDayWeekend":"单休", - "twoDaysOff":"双休", - "oddOrEvenDaysOff":"单双休", - "year":"年", - "month":"月", - "libertyDay":"放假日期", - "coverDate":"补班日期", - "addedHoliday":"添加假日", - "startDate":"开始日期", - "accessDate":"接入日期", - "mustFillIn":"必填", - "endDate":"结束日期", - "dailyCharts":"日榜", - "monthlyLeaderboard":"月榜", - "noAttendanceRecord":"无考勤记录", - "attendanceRecord":"考勤记录", - "everyoneIsVeryMotivated":"大家干劲十足", - "workingHoursWereNotReleased":"工作时长未出炉", - "beLate":"迟到", - "leaveEarly":"早退", - "noCardPunched":"未打卡", - "holidayInfo":"假日信息", - - "basicInformation":"基本信息", - "wirelessKeyboard":"无线键盘", - "doorMagnetic":"门磁", - "remoteUnlocking":"远程开锁", - "automaticBlocking":"自动闭锁", - "normallyOpenMode":"常开模式", - "automaticUnLock":"自动开锁", - "automaticUnLockTip":"开启后锁将在常开模式开始时自动打开", - "lockSound":"锁声音", - "burglarAlarm":"防撬报警", - "resetButton":"重置键", - "lockTime":"锁时间", - "diagnose":"诊断", - "uploadData":"上传数据", - "importOtherLockData":"导入其他锁数据", - "lockEscalation":"锁升级", - "markedHouseState":"标记房态", - "unlockReminder":"开锁提醒", - "unlockQRCode":"微信二维码", - "lockNumber":"锁编号", - "electricQuantity":"电量", - "lockName":"名称", - "lockGrouping":"锁分组", - "selectGroup":"选择分组", - "createNewGroup":"创建新分组", - "adminOpenLockPassword":"管理员开锁密码", - "update":"更新", - "updateElectricQuantityTip":"电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新", - "adminOpenLockPasswordTip":"如果你在锁上修改过密码，锁内实际有效密码与这里显示的可能不同", - "updateLockAdminPassword":"上传锁内管理员密码", - "whenScreenFlashesClickNext":"当屏幕闪烁时，点击下一步", - "theScreenNeverFlickered":"屏幕一直没有闪烁", - "enterNumberOrPressSet":"输入*529#或按设置键", - "theLocationOfTheSetKeyWillBeDifferent":"设置键的位置会有差异", - "pressAndHoldTheResetButtonTwoSeconds":"长按重置键2秒", - "nearbyEquipment":"附近的设备", - "noData":"暂无数据", - "doorMagneticListTopTip":"通过门磁可查询门的开、关状态。每把锁咳添加一个门磁", - "remoteUnlockingPageTip":"功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。", - "currentMode":"当前模式", - "delayTime":"延迟时间", - "automaticBlockingTip":"经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效", - "time":"时间", - "normallyOpen":"常开", - "date":"日期", - "begin":"开始", - "end":"结束", - "allDay":"全天", - "save":"保存", - "normallyOpenModeTip":"在设置的常开时间内，锁被打开后将一直处于打开的状态，直到被手动关闭", - "pleaseSelectLockVolume":"请选择锁音量", - "lockSoundTip":"功能开启后，你将可以听到智能锁的提示音。包括电量过低，密码错误等提示。", - "low":"低", - "lower":"较低", - "medium":"中", - "higher":"较高", - "high":"高", - "burglarAlarmTip":"开启后，锁被撬动时，会发出报警声", - "resetButtonTip1":"开启后，可通过长按锁上的重置键来用APP重新添加", - "resetButtonTip2":"关闭后，重置键无效，锁要通过app删除后才能重新添加", - "calibrationTime":"校准时间", - "setTheDSTMode":"夏令时模式设置", - "diagnoseTip":"诊断是读取锁内的配置信息并上传，以便工作人员分析故障的原因", - "uploading":"上传", - "uploadDataTip":"本操作将上传锁内数据到服务器，过程可能需要几分钟，请耐心等待", - "importOtherLockDataTip":"请选择要从哪把锁导入", - "haveNewVersion":"有新版本", - "currentVersion":"当前版本", - "newVersion":"新版本", - "upgrade":"升级", - "leisure":"空闲", - "checkedIn":"已入住", - - "lanEnglish":"英文", - "lanChinese":"中文", - "multilingual":"多语言", - "addLock":"添加锁", - "lockAddress":"锁地址", - "selectLockType":"选择锁类型", - "videoIntercomDoorLock":"可视对讲门锁", - "NFCPassiveLock":"NFC无源锁", - "addDevice":"添加设备", - "gateway":"网关", - "message":"消息", - "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":"修改账号", - "resetPasswords":"重置密码", - "safetyProblem":"安全问题", - "modifyAccountTip":"为了你的账号安全，修改账号前请先使用验证码验证", - "pleaseEnterAccountNumber":"请输入账号", - "pleaseEnterNewAccountNumber":"请输入新账号", - "changeIphoneTip":"找回密码和登录新设备时，可通过绑定的手机验证", - "changeEmailTip":"找回密码和登录新设备时，可通过绑定的邮箱验证", - "goBind":"去绑定", - "originalPassword":"原密码", - "newPassword":"新密码", - "surePassword":"确认密码", - "safetyProblemTip":"当你手机丢了，可以通过回答设置的安全问题来登录新设备", - "problemOne":"问题一", - "problemTwo":"问题二", - "problemThree":"问题三", - "pleaseEnterYourAnswer":"请输入你的答案", - "aboutToExpire":"即将到期", - "changeName":"修改名称", - "deAuthorize":"去授权", - + "starLock": "星锁", + "lockThrough": "锁通通", + "clickUnlockAndHoldDownClose": "点击开锁，长按闭锁", + "checkingIn": "考勤", + "electronicKey": "电子钥匙", + "password": "密码", + "card": "卡", + "fingerprint": "指纹", + "remoteControl": "遥控", + "face": "人脸", + "operatingRecord": "操作记录", + "doorLockLog": "门锁日志", + "number": "号", + "additive": "添加者", + "addTime": "添加时间", + "reset": "重置", + "sendKey": "发送钥匙", + "timeLimit": "限时", + "permanent": "永久", + "once": "单次", + "circulation": "循环", + "receiver": "接收者", + "pleaseEnterNumberOrEmail": "请输入手机号或者邮箱", + "name": "姓名", + "enterYourName": "请输入姓名", + "effectiveTime": "生效时间", + "failureTime": "失效时间", + "effectiveDate": "生效日期", + "failureDate": "失效日期", + "monday": "星期一", + "tuesday": "星期二", + "wednesday": "星期三", + "thursday": "星期四", + "friday": "星期五", + "saturday": "星期六", + "sunday": "星期日", + "mondayShort": "一", + "tuesdayShort": "二", + "wednesdayShort": "三", + "thursdayShort": "四", + "fridayShort": "五", + "saturdayShort": "六", + "sundayShort": "日", + "realNameAuthentication": "实名认证", + "sendKeyBottomTip": "接收者在有效期内可以不限次数使用", + "send": "发送", + "periodValidity": "有效期", + "sendGroupKey": "群发钥匙", + "lock": "锁", + "pleaseAdd": "请添加", + "pleaseSelect": "请选择", + "remoteUnlockingAllowed": "允许远程开锁", + "pleaseEnter": "请输入", + "getPassword": "获取密码", + "custom": "自定义", + "clearAll": "清空", + "recursiveDevice": "循环方式", + "pleaseNameYourPassword": "请给密码命名", + "pleaseEnterDigitsNumber": "请输入6-9位数字", + "getPasswordTip1": "密码在24小时内至少要使用过一次，否则将无效", + "getPasswordTip2": "限时密码可以在有效期内不限次数使用 \n密码在生效后的24小时内至少要使用过一次，否则将失效", + "getPasswordTip3": "密码有限期为6个小时，只能使用一次", + "getPasswordTip4": "手动输入6-9位数字作为密码。可在锁旁边通过手机蓝牙添加，也可以通过网关远程添加", + "getPasswordTip5": "限时密码可以再有下期内不限次数使用 \n密码在生效后的24小时内至少要使用过一次,否则将失效", + "getPasswordTip6": "密码有效期为24小时，在锁上输入后，将使之前使用过的密码都失效", + "getTip": "获取", + "addTip": "添加", + "sender": "发送人", + "senderTime": "发送时间", + "keyDetail": "钥匙详情", + "detail": "详情", + "delete": "删除", + "passwordDetail": "密码详情", + "share": "分享", + "amend": "修改", + "sure": "确定", + "cancel": "取消", + "add": "添加", + "accountNumber": "账号", + "volumeAuthorizationLock": "批量授权锁", + "authorizedAdminTip": "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人", + "lockOperatingRecordTip": "只能保留一定时间内的记录，如果您需要保留历史记录，可以在右上角导出", + "rankingList": "排列榜", + "earlyArrivalList": "早到榜", + "lateList": "迟到榜", + "hardWorkingList": "勤奋榜", + "company": "公司", + "staff": "员工", + "work": "工作", + "workday": "工作日", + "holidays": "节假日", + "punchingMode": "打卡方式", + "whetherTheEmployeeHasAKey": "员工是否有钥匙", + "selectKey": "选择钥匙", + "officeHours": "上班时间", + "closingTime": "下班时间", + "thisWeek": "本周", + "singleDayWeekend": "单休", + "twoDaysOff": "双休", + "oddOrEvenDaysOff": "单双休", + "year": "年", + "month": "月", + "libertyDay": "放假日期", + "coverDate": "补班日期", + "addedHoliday": "添加假日", + "startDate": "开始日期", + "accessDate": "接入日期", + "mustFillIn": "必填", + "endDate": "结束日期", + "dailyCharts": "日榜", + "monthlyLeaderboard": "月榜", + "noAttendanceRecord": "无考勤记录", + "attendanceRecord": "考勤记录", + "everyoneIsVeryMotivated": "大家干劲十足", + "workingHoursWereNotReleased": "工作时长未出炉", + "beLate": "迟到", + "leaveEarly": "早退", + "noCardPunched": "未打卡", + "holidayInfo": "假日信息", + "basicInformation": "基本信息", + "wirelessKeyboard": "无线键盘", + "doorMagnetic": "门磁", + "remoteUnlocking": "远程开锁", + "automaticBlocking": "自动闭锁", + "normallyOpenMode": "常开模式", + "automaticUnLock": "自动开锁", + "automaticUnLockTip": "开启后锁将在常开模式开始时自动打开", + "lockSound": "锁声音", + "burglarAlarm": "防撬报警", + "resetButton": "重置键", + "lockTime": "锁时间", + "diagnose": "诊断", + "uploadData": "上传数据", + "importOtherLockData": "导入其他锁数据", + "lockEscalation": "锁升级", + "markedHouseState": "标记房态", + "unlockReminder": "开锁提醒", + "unlockQRCode": "微信二维码", + "lockNumber": "锁编号", + "electricQuantity": "电量", + "lockName": "名称", + "lockGrouping": "锁分组", + "selectGroup": "选择分组", + "createNewGroup": "创建新分组", + "adminOpenLockPassword": "管理员开锁密码", + "update": "更新", + "updateElectricQuantityTip": "电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新", + "adminOpenLockPasswordTip": "如果你在锁上修改过密码，锁内实际有效密码与这里显示的可能不同", + "updateLockAdminPassword": "上传锁内管理员密码", + "whenScreenFlashesClickNext": "当屏幕闪烁时，点击下一步", + "theScreenNeverFlickered": "屏幕一直没有闪烁", + "enterNumberOrPressSet": "输入*529#或按设置键", + "theLocationOfTheSetKeyWillBeDifferent": "设置键的位置会有差异", + "pressAndHoldTheResetButtonTwoSeconds": "长按重置键2秒", + "nearbyEquipment": "附近的设备", + "noData": "暂无数据", + "doorMagneticListTopTip": "通过门磁可查询门的开、关状态。每把锁咳添加一个门磁", + "remoteUnlockingPageTip": "功能开启后，你将可以通过网关远程开锁。此功能的开启和关闭只能在锁附近通过手机蓝牙进行。", + "currentMode": "当前模式", + "delayTime": "延迟时间", + "automaticBlockingTip": "经过以上设定的时间，锁会自动关闭。开启或修改设置后，请先开一次锁，使时间生效", + "time": "时间", + "normallyOpen": "常开", + "date": "日期", + "begin": "开始", + "end": "结束", + "allDay": "全天", + "save": "保存", + "normallyOpenModeTip": "在设置的常开时间内，锁被打开后将一直处于打开的状态，直到被手动关闭", + "pleaseSelectLockVolume": "请选择锁音量", + "lockSoundTip": "功能开启后，你将可以听到智能锁的提示音。包括电量过低，密码错误等提示。", + "low": "低", + "lower": "较低", + "medium": "中", + "higher": "较高", + "high": "高", + "burglarAlarmTip": "开启后，锁被撬动时，会发出报警声", + "resetButtonTip1": "开启后，可通过长按锁上的重置键来用APP重新添加", + "resetButtonTip2": "关闭后，重置键无效，锁要通过app删除后才能重新添加", + "calibrationTime": "校准时间", + "setTheDSTMode": "夏令时模式设置", + "diagnoseTip": "诊断是读取锁内的配置信息并上传，以便工作人员分析故障的原因", + "uploading": "上传", + "uploadDataTip": "本操作将上传锁内数据到服务器，过程可能需要几分钟，请耐心等待", + "importOtherLockDataTip": "请选择要从哪把锁导入", + "haveNewVersion": "有新版本", + "currentVersion": "当前版本", + "newVersion": "新版本", + "upgrade": "升级", + "leisure": "空闲", + "checkedIn": "已入住", + "lanEnglish": "英文", + "lanChinese": "中文", + "multilingual": "多语言", + "addLock": "添加锁", + "lockAddress": "锁地址", + "selectLockType": "选择锁类型", + "videoIntercomDoorLock": "可视对讲门锁", + "NFCPassiveLock": "NFC无源锁", + "addDevice": "添加设备", + "gateway": "网关", + "message": "消息", + "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": "修改账号", + "resetPasswords": "重置密码", + "safetyProblem": "安全问题", + "modifyAccountTip": "为了你的账号安全，修改账号前请先使用验证码验证", + "pleaseEnterAccountNumber": "请输入账号", + "pleaseEnterNewAccountNumber": "请输入新账号", + "changeIphoneTip": "找回密码和登录新设备时，可通过绑定的手机验证", + "changeEmailTip": "找回密码和登录新设备时，可通过绑定的邮箱验证", + "goBind": "去绑定", + "originalPassword": "原密码", + "newPassword": "新密码", + "surePassword": "确认密码", + "safetyProblemTip": "当你手机丢了，可以通过回答设置的安全问题来登录新设备", + "problemOne": "问题一", + "problemTwo": "问题二", + "problemThree": "问题三", + "pleaseEnterYourAnswer": "请输入你的答案", + "aboutToExpire": "即将到期", + "changeName": "修改名称", + "deAuthorize": "去授权", "designation": "名称", "state": "状态", "wifiName": "WiFi名称", @@ -297,163 +291,146 @@ "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":"购买", - "customSMSTemplate":"自定义短信模版", - "customMailTemplate":"自定义邮件模版", - "record":"记录", - - "buyRealNameTip":"给用户发送电子钥匙时，可以要求其开锁前先进行人脸识别，以保证是他本人在操作。人脸实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。", - "buyRealNameSelectYouWantBuyTip":"请选择你希望的实名认证频数", - "forTheFirstTime":"仅首次", - "onceDay":"每日一次", - "weekOnce":"每周一次", - "monthOnce":"每月一次", - - "currentState":"当前状态", - "onTrial":"试用中", - "haveNotOpened":"未开通", - "advancedFeaturesAndBenefitsContent":"高级功能权益内容", - "smsTemplate":"短信模板", - "emailTemplate":"邮件模板", - "cardIssuingtool":"发卡工具", - "titleForBuyingAdvancedFeatures":"购买高级功能须知", - "tipsForBuyingAdvancedFeatures":"更多的高级功能正在开发中，如果您需要这些功能，欢迎根据锁的数量开通服务。高级功能仅能用于您自己的锁。如果您是授权管理员，请联系锁的最高管理员开通服务。", - "freeTrial":"免费体验", - "openNow":"立即开通", - - "buySMS":"购买短信", - "buyMail":"购买邮件", - "buyRealNameAuthenticationTimes":"购买实名认证次数", - "enablingAdvancedFeatures":"开通高级功能", - "chooseAPackage":"选择套餐", - "modeOfPayment":"支付方式", - "alipay":"支付宝", - "goToPay":"去支付", - - "customTemplatesTip":"你可以自己定义模版的内容，用于发送密码或电子钥匙信息给他人", - "haveOpened":"已开通", - "unHaveOpenedTip1":"该功能是高级功能，请开通后再使用", - "unHaveOpenedTip2":"高级功能仅能用于你自己的锁", - "freeTrialKeywords":"免费试用", - "goToTheOpen":"去开通", - "creatingANewTemplate":"新建模板", - "type":"类型", - "templateContent":"模版内容", - "preview":"预览", - "hello":"你好", - "yourRoomIs":"您的房间是", - "roomName":"房间名", - "theCodeToOpenTheDoorIs":"开门密码是", - "templateTip1":"输入密码后请按#号键或其他开锁键结束。密码生效后24小时内至少要使用一次，否则将失效", - "templateTip2":"你收到一把电子钥匙，请使用小程序开门。", - "templateTip3":"或安装App来开门。", - "expectedNotoCount":"预计产生短信条数", - + "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": "购买", + "customSMSTemplate": "自定义短信模版", + "customMailTemplate": "自定义邮件模版", + "record": "记录", + "buyRealNameTip": "给用户发送电子钥匙时，可以要求其开锁前先进行人脸识别，以保证是他本人在操作。人脸实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。", + "buyRealNameSelectYouWantBuyTip": "请选择你希望的实名认证频数", + "forTheFirstTime": "仅首次", + "onceDay": "每日一次", + "weekOnce": "每周一次", + "monthOnce": "每月一次", + "currentState": "当前状态", + "onTrial": "试用中", + "haveNotOpened": "未开通", + "advancedFeaturesAndBenefitsContent": "高级功能权益内容", + "smsTemplate": "短信模板", + "emailTemplate": "邮件模板", + "cardIssuingtool": "发卡工具", + "titleForBuyingAdvancedFeatures": "购买高级功能须知", + "tipsForBuyingAdvancedFeatures": "更多的高级功能正在开发中，如果您需要这些功能，欢迎根据锁的数量开通服务。高级功能仅能用于您自己的锁。如果您是授权管理员，请联系锁的最高管理员开通服务。", + "freeTrial": "免费体验", + "openNow": "立即开通", + "buySMS": "购买短信", + "buyMail": "购买邮件", + "buyRealNameAuthenticationTimes": "购买实名认证次数", + "enablingAdvancedFeatures": "开通高级功能", + "chooseAPackage": "选择套餐", + "modeOfPayment": "支付方式", + "alipay": "支付宝", + "goToPay": "去支付", + "customTemplatesTip": "你可以自己定义模版的内容，用于发送密码或电子钥匙信息给他人", + "haveOpened": "已开通", + "unHaveOpenedTip1": "该功能是高级功能，请开通后再使用", + "unHaveOpenedTip2": "高级功能仅能用于你自己的锁", + "freeTrialKeywords": "免费试用", + "goToTheOpen": "去开通", + "creatingANewTemplate": "新建模板", + "type": "类型", + "templateContent": "模版内容", + "preview": "预览", + "hello": "你好", + "yourRoomIs": "您的房间是", + "roomName": "房间名", + "theCodeToOpenTheDoorIs": "开门密码是", + "templateTip1": "输入密码后请按#号键或其他开锁键结束。密码生效后24小时内至少要使用一次，否则将失效", + "templateTip2": "你收到一把电子钥匙，请使用小程序开门。", + "templateTip3": "或安装App来开门。", + "expectedNotoCount": "预计产生短信条数", "templateTip4": "提示：向其他人发送消息时，关键宇", - "and":"和", - "willBeReplacedWithTheActualValue":"将替换为实际值", - "downloadLink":"下载链接", - - "lockScreenTip":"功能开启后，需使用指纹、人脸或账号密码来打开 APP。3分钟内不需要再次验证", - "hideInvalidUnlockPermissionsTip":"功能开启后，已失效较长时间的密码、电子钥匙、卡、指纹等开锁权限将被隐藏，不在列表里显示。", - "appUnlockRequiresMobilePhoneAccessToTheLockTip":"对于选中的这些锁，当用户用APP开锁时，他的手机需要是连网的，否则无法开锁", - "checkAll":"全选", - - "wifiDistributionNetwork":"WiFi配网", - "configuringWiFi":"配置WiFi", - "pleaseEnterWifiName":"请输入WiFi名字", - "wifiPwd":"WiFi名字", - "pleaseEnterWifiPwd":"请输入WiFi密码", - "edit":"编辑", - "stressFingerprint":"胁迫指纹", - "effectiveDay":"有效日", - "stressCard":"胁迫卡", - "stressPassword":"胁迫密码", - - "whetherTheEmployeeHasPassword":"员工是否有密码", - "whetherTheEmployeeHasCard":"员工是否有卡", - "whetherTheEmployeeHasFingerprint":"员工是否有指纹", - "selectPassword":"选择密码", - "selectCard":"选择卡", - "selectFingerprint":"选择指纹", - "getKey":"获取钥匙", - "getCard":"获取卡", - "getFingerprint":"获取指纹", - "safeVerify":"安全验证", - "deleteAccountTips":"删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？", - - "humanFace":"人脸", - "monitoring":"监控", - "videoLog":"视频日志", - "messageReminding":"消息提醒", - "superAdmin":"超级管理员", - "normalUser":"普通用户", - "gatewayDevice":"网关设备", - - "illumination":"照明", - "doorOpener":"开门器", - "faceUnlocks":"面容开锁", - "catEyeSet":"猫眼设置", - "openingDirectionSet":"开门方向设置", - "motorPowerSetting":"电机功率设置", - "bluetoothBroadcast":"蓝牙广播", - "whetherInternetRequiredWhenUnlocking":"开锁时是否需联网", - - "selectTheLockToJoinTheGroup":"选择要加入分组的锁", - "lockTrCount":"锁数量", - "xiaomiIOTPlatform":"小米IOT平台", - "connectBlueErrorTip":"未连接到设备，请确保在设备附近，设备未被连接，设备已打开", + "and": "和", + "willBeReplacedWithTheActualValue": "将替换为实际值", + "downloadLink": "下载链接", + "lockScreenTip": "功能开启后，需使用指纹、人脸或账号密码来打开 APP。3分钟内不需要再次验证", + "hideInvalidUnlockPermissionsTip": "功能开启后，已失效较长时间的密码、电子钥匙、卡、指纹等开锁权限将被隐藏，不在列表里显示。", + "appUnlockRequiresMobilePhoneAccessToTheLockTip": "对于选中的这些锁，当用户用APP开锁时，他的手机需要是连网的，否则无法开锁", + "checkAll": "全选", + "wifiDistributionNetwork": "WiFi配网", + "configuringWiFi": "配置WiFi", + "pleaseEnterWifiName": "请输入WiFi名字", + "wifiPwd": "WiFi名字", + "pleaseEnterWifiPwd": "请输入WiFi密码", + "edit": "编辑", + "stressFingerprint": "胁迫指纹", + "effectiveDay": "有效日", + "stressCard": "胁迫卡", + "stressPassword": "胁迫密码", + "whetherTheEmployeeHasPassword": "员工是否有密码", + "whetherTheEmployeeHasCard": "员工是否有卡", + "whetherTheEmployeeHasFingerprint": "员工是否有指纹", + "selectPassword": "选择密码", + "selectCard": "选择卡", + "selectFingerprint": "选择指纹", + "getKey": "获取钥匙", + "getCard": "获取卡", + "getFingerprint": "获取指纹", + "safeVerify": "安全验证", + "deleteAccountTips": "删除账号后，你的所有信息及相关记录都会从平台彻底删除，且不可恢复，是否删除？", + "humanFace": "人脸", + "monitoring": "监控", + "videoLog": "视频日志", + "messageReminding": "消息提醒", + "superAdmin": "超级管理员", + "normalUser": "普通用户", + "gatewayDevice": "网关设备", + "illumination": "照明", + "doorOpener": "开门器", + "faceUnlocks": "面容开锁", + "catEyeSet": "猫眼设置", + "openingDirectionSet": "开门方向设置", + "motorPowerSetting": "电机功率设置", + "bluetoothBroadcast": "蓝牙广播", + "whetherInternetRequiredWhenUnlocking": "开锁时是否需联网", + "selectTheLockToJoinTheGroup": "选择要加入分组的锁", + "lockTrCount": "锁数量", + "xiaomiIOTPlatform": "小米IOT平台", + "connectBlueErrorTip": "未连接到设备，请确保在设备附近，设备未被连接，设备已打开", "pleaseEnterAGroupName": "请输入分组名称", "hint": "提示", "areYouSureYouWantToDeleteIt": "确定要删除吗?", - "faceUnlocksSet": "面容开锁设置", "automaticBrighteningScreen": "自动亮屏", "sensingDistance": "感应距离", @@ -464,60 +441,56 @@ "closeRange": "近距离", "addAndUseFaceWhenUnlocking": "添加和使用面容开锁时", "addAndUseFaceWhenUnlockingTip": "\n1、请尽量保持单人在门前操作；\n2、请站立在门锁正前方约0.5~0.8米，面向门锁；\n3、请保持脸部无遮挡，露出五官；\n4、面容识别异常时，可触摸数字键盘任意按键，手动重启人脸识别。", - "second": "秒", "motorPowerSettingTip": "请根据门锁实际情况，请谨慎选择电机功率：", "miniwatt": "小功率：", "miniwattTip": "耗电少", "highPower": "大功率：", "highPowerTip": "如果开锁时锁舌不能正常收回,，或需要带动\n天地钩，建议选择大功率。此时耗电将会\n增加。", - "openingDirectionSetTip": "请谨慎选择您家的开门方向(如果选择错误，将无法正常开关门）：", "openLeft": "左开", "openRight": "右开", "judgmentMethod": "判断方法：\n", "judgmentMethodContent": "人站在屋外，面向入户门。\n如果门的合页或门轴在左边，则门是左开；\n如果门的合页或门轴在右边，则门是右开。\n如果设置错误，将无法正常开关门。\n建议由安装或维修人员操作。", - "customMode": "自定义模式", "videoSlot": "录像时段", - - "密码":"密码", - "卡":"卡", - "指纹":"指纹", - "人脸":"人脸", - "配件商城":"配件商城", - "公司名称":"公司名称", - "修改公司名字":"修改公司名字", - "请输入公司名字":"请输入公司名字", - "提示":"提示", - "是否删除？":"是否删除？", - "员工信息":"员工信息", - "员工":"员工", - "打卡方式无效":"打卡方式无效", - "中国":"中国", - "选择钥匙":"选择钥匙", - "编辑":"编辑", - "无":"无", - "有":"有", - "请输入姓名":"请输入姓名", - "获取人脸":"获取人脸", - "选择密码":"选择密码", - "选择卡":"选择卡", - "选择指纹":"选择指纹", - "选择人脸":"选择人脸", - "员工是否有人脸":"员工是否有人脸", - "同时删除员工钥匙":"同时删除员工钥匙", - "删除":"删除", - "确定要删除员工吗?":"确定要删除员工吗?", - "月统计":"月统计", - "迟到":"迟到", - "早退":"早退", - "钥匙将在":"钥匙将在", - "天后失效":"天后失效", - "锁电量更新时间:":"锁电量更新时间:", - "新增配件":"新增配件", - "请在锁旁边完成第一次开锁":"请在锁旁边完成第一次开锁", - "正在开锁中...":"正在开锁中...", + "密码": "密码", + "卡": "卡", + "指纹": "指纹", + "人脸": "人脸", + "配件商城": "配件商城", + "公司名称": "公司名称", + "修改公司名字": "修改公司名字", + "请输入公司名字": "请输入公司名字", + "提示": "提示", + "是否删除？": "是否删除？", + "员工信息": "员工信息", + "员工": "员工", + "打卡方式无效": "打卡方式无效", + "中国": "中国", + "选择钥匙": "选择钥匙", + "编辑": "编辑", + "无": "无", + "有": "有", + "请输入姓名": "请输入姓名", + "获取人脸": "获取人脸", + "选择密码": "选择密码", + "选择卡": "选择卡", + "选择指纹": "选择指纹", + "选择人脸": "选择人脸", + "员工是否有人脸": "员工是否有人脸", + "同时删除员工钥匙": "同时删除员工钥匙", + "删除": "删除", + "确定要删除员工吗?": "确定要删除员工吗?", + "月统计": "月统计", + "迟到": "迟到", + "早退": "早退", + "钥匙将在": "钥匙将在", + "天后失效": "天后失效", + "锁电量更新时间:": "锁电量更新时间:", + "新增配件": "新增配件", + "请在锁旁边完成第一次开锁": "请在锁旁边完成第一次开锁", + "正在开锁中...": "正在开锁中...", "你的钥匙": "你的钥匙", "常开模式启动！长按闭锁": "常开模式启动！长按闭锁", "演示模式": "演示模式", @@ -708,9 +681,8 @@ "厂商": "厂商", "型号": "型号", "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。": "密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。", - "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。":"密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。", - "密码不一致哦":"密码不一致哦", - + "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。": "密码生成后，请在当日23：59前使用，否则过0点后失效。清空码用于清空今天0点之前生成的所有密码。", + "密码不一致哦": "密码不一致哦", "相机": "相机", "相册": "相册", "读写": "读写", @@ -727,143 +699,143 @@ "请手动在系统设置中开启": "请手动在系统设置中开启", "权限以继续使用应用": "权限以继续使用应用。", "去设置": "去设置", - - "虹膜":"虹膜", - "手掌":"手掌", - - "商城":"商城", - "我的":"我的", - "微信公众号推送":"微信公众号推送", - "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置":"开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置", - "蓝牙":"蓝牙", - "需要访问蓝牙权限才能使用添加钥匙功能的位置信息":"需要访问蓝牙权限才能使用添加钥匙功能的位置信息", - "请输入Email":"请输入Email", - "请输入手机号":"请输入手机号", - "家人到家":"家人到家", - "添加家人":"添加家人", - "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择":"若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择", - "消息提醒":"消息提醒", - "开门通知":"开门通知", - "N天未开门":"N天未开门", - "门未关好":"门未关好", - "防拆报警":"防拆报警", - "低电量提醒":"低电量提醒", - "胁迫开门":"胁迫开门", - "有人按门铃":"有人按门铃", - "有人出现在门口":"有人出现在门口", - "提醒方式":"提醒方式", - "电子钥匙":"电子钥匙", - "开门方式":"开门方式", - "请选择":"请选择", - "家人":"家人", - "保存":"保存", - "APP推送":"APP推送", - "管理员":"管理员", - "未启用":"未启用", - "已启用":"已启用", - "省电模式":"省电模式", - "逗留抓拍模式":"逗留抓拍模式", - "实时监控模式":"实时监控模式", - "自定义模式":"自定义模式", - "秒":"秒", - "猫眼设置":"猫眼设置", - "猫眼工作模式":"猫眼工作模式", - "自动亮屏":"自动亮屏", - "亮屏持续时间":"亮屏持续时间", - "逗留警告":"逗留警告", - "异常警告":"异常警告", - "短信提醒":"短信提醒", - "邮件提醒":"邮件提醒", - "关锁":"关锁", - "功能":"功能", - "配件":"配件", - "N天未开门提醒":"N天未开门提醒", - "当被胁迫要求强行开锁时，使用胁迫指纹会触发报警，报警消息会推送给管理员，该功能需要锁联网":"当被胁迫要求强行开锁时，使用胁迫指纹会触发报警，报警消息会推送给管理员，该功能需要锁联网", - "胁迫指纹":"胁迫指纹", - "指纹列表":"指纹列表", - "经过以上设定的时间，锁没有被开启，系统会给指定对象发送提醒消息，该功能需要锁联网":"经过以上设定的时间，锁没有被开启，系统会给指定对象发送提醒消息，该功能需要锁联网", - "打开提醒后，当锁电量低于20%、10%和5%，系统会给指定对象发送提醒消息。电量读取方式：网关读取或APP读取。":"打开提醒后，当锁电量低于20%、10%和5%，系统会给指定对象发送提醒消息。电量读取方式：网关读取或APP读取。", - "门未开时间":"门未开时间", - "添加和使用面容开锁时：":"添加和使用面容开锁时：", - "云存":"云存", - "本地":"本地", - "3天滚动储存":"3天滚动储存", - "去升级":"去升级", - "下载列表":"下载列表", - "已下载":"已下载", - "全部视频":"全部视频", - "已为本设备免费提供3大滚动视频储存服务":"已为本设备免费提供3大滚动视频储存服务", - "视频播放":"视频播放", - "全选":"全选", - "请选择要删除的视频":"请选择要删除的视频", - "请选择要下载的视频":"请选择要下载的视频", - "欢迎使用":"欢迎使用", + "虹膜": "虹膜", + "手掌": "手掌", + "商城": "商城", + "我的": "我的", + "微信公众号推送": "微信公众号推送", + "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置": "开启微信接收报警消息需要先关注斯凯智能锁微信公众号，请保存二维码并使用微信扫一扫设置", + "蓝牙": "蓝牙", + "需要访问蓝牙权限才能使用添加钥匙功能的位置信息": "需要访问蓝牙权限才能使用添加钥匙功能的位置信息", + "请输入Email": "请输入Email", + "请输入手机号": "请输入手机号", + "家人到家": "家人到家", + "添加家人": "添加家人", + "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择": "若锁没有联网，除电子钥匙外，密码、卡、指纹等开门提醒无法及时发送，请根据你的实际情况选择", + "消息提醒": "消息提醒", + "开门通知": "开门通知", + "N天未开门": "N天未开门", + "门未关好": "门未关好", + "防拆报警": "防拆报警", + "低电量提醒": "低电量提醒", + "胁迫开门": "胁迫开门", + "有人按门铃": "有人按门铃", + "有人出现在门口": "有人出现在门口", + "提醒方式": "提醒方式", + "电子钥匙": "电子钥匙", + "开门方式": "开门方式", + "请选择": "请选择", + "家人": "家人", + "保存": "保存", + "APP推送": "APP推送", + "管理员": "管理员", + "未启用": "未启用", + "已启用": "已启用", + "省电模式": "省电模式", + "逗留抓拍模式": "逗留抓拍模式", + "实时监控模式": "实时监控模式", + "自定义模式": "自定义模式", + "秒": "秒", + "猫眼设置": "猫眼设置", + "猫眼工作模式": "猫眼工作模式", + "自动亮屏": "自动亮屏", + "亮屏持续时间": "亮屏持续时间", + "逗留警告": "逗留警告", + "异常警告": "异常警告", + "短信提醒": "短信提醒", + "邮件提醒": "邮件提醒", + "关锁": "关锁", + "功能": "功能", + "配件": "配件", + "N天未开门提醒": "N天未开门提醒", + "当被胁迫要求强行开锁时，使用胁迫指纹会触发报警，报警消息会推送给管理员，该功能需要锁联网": "当被胁迫要求强行开锁时，使用胁迫指纹会触发报警，报警消息会推送给管理员，该功能需要锁联网", + "胁迫指纹": "胁迫指纹", + "指纹列表": "指纹列表", + "经过以上设定的时间，锁没有被开启，系统会给指定对象发送提醒消息，该功能需要锁联网": "经过以上设定的时间，锁没有被开启，系统会给指定对象发送提醒消息，该功能需要锁联网", + "打开提醒后，当锁电量低于20%、10%和5%，系统会给指定对象发送提醒消息。电量读取方式：网关读取或APP读取。": "打开提醒后，当锁电量低于20%、10%和5%，系统会给指定对象发送提醒消息。电量读取方式：网关读取或APP读取。", + "门未开时间": "门未开时间", + "添加和使用面容开锁时：": "添加和使用面容开锁时：", + "云存": "云存", + "本地": "本地", + "3天滚动储存": "3天滚动储存", + "去升级": "去升级", + "下载列表": "下载列表", + "已下载": "已下载", + "全部视频": "全部视频", + "已为本设备免费提供3大滚动视频储存服务": "已为本设备免费提供3大滚动视频储存服务", + "视频播放": "视频播放", + "全选": "全选", + "请选择要删除的视频": "请选择要删除的视频", + "请选择要下载的视频": "请选择要下载的视频", + "欢迎使用": "欢迎使用", "用户协议和隐私政策概要": "用户协议和隐私政策概要", "协议概要": "协议概要", - "感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读":"感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读", - "《用户协议》":"《用户协议》", - "和":"和", + "感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读": "感谢您使用本应用。我们非常重视您的个人信息和隐私保护，在使用本产品之前，请认真阅读", + "《用户协议》": "《用户协议》", + "和": "和", "《隐私政策》": "《隐私政策》", "的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。": "的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。", - "不同意":"不同意", - "同意":"同意", - "当前状态：已开通":"当前状态：已开通", - "该功能是高级功能，请开通后再使用":"该功能是高级功能，请开通后再使用", - "常用程序":"常用程序", - "该锁已被重置":"该锁已被重置", - "记录":"记录", - "需要访问读写权限才能使用手动升级固件":"需要访问读写权限才能使用手动升级固件", - "错误D固件，请选择正确的文件":"错误固件，请选择正确的文件", - "非SYD固件，请选择正确的文件":"非SYD固件，请选择正确的文件", - "文件校验失败 0x01":"文件校验失败 0x01", - "解析元数据失败，请选择正确的文件":"解析元数据失败，请选择正确的文件", - "文件校验失败 0x02":"文件校验失败 0x02", - "文件校验失败 0x03":"文件校验失败 0x03", - "固件升级完成":"固件升级完成", - "开通高级功能后才可以对锁进行管理":"开通高级功能后才可以对锁进行管理", - "去开通":"去开通", - "实名认证":"实名认证", - "当前剩余数量":"当前剩余数量", - "购买":"购买", - "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用", - - "退出添加":"退出添加", - "管理员已满":"管理员已满", + "不同意": "不同意", + "同意": "同意", + "当前状态：已开通": "当前状态：已开通", + "该功能是高级功能，请开通后再使用": "该功能是高级功能，请开通后再使用", + "常用程序": "常用程序", + "该锁已被重置": "该锁已被重置", + "记录": "记录", + "需要访问读写权限才能使用手动升级固件": "需要访问读写权限才能使用手动升级固件", + "错误D固件，请选择正确的文件": "错误固件，请选择正确的文件", + "非SYD固件，请选择正确的文件": "非SYD固件，请选择正确的文件", + "文件校验失败 0x01": "文件校验失败 0x01", + "解析元数据失败，请选择正确的文件": "解析元数据失败，请选择正确的文件", + "文件校验失败 0x02": "文件校验失败 0x02", + "文件校验失败 0x03": "文件校验失败 0x03", + "固件升级完成": "固件升级完成", + "开通高级功能后才可以对锁进行管理": "开通高级功能后才可以对锁进行管理", + "去开通": "去开通", + "实名认证": "实名认证", + "当前剩余数量": "当前剩余数量", + "购买": "购买", + "实名认证为付费功能，请购买后再使用": "实名认证为付费功能，请购买后再使用", + "退出添加": "退出添加", + "管理员已满": "管理员已满", "用户已满": "用户已满", "锁上面添加指纹已满": "锁上面添加指纹已满", "指纹已存在": "指纹已存在", "锁上面添加人脸已满": "锁上面添加人脸已满", "人脸已存在": "人脸已存在", - "锁上面添加卡已满":"锁上面添加卡已满", + "锁上面添加卡已满": "锁上面添加卡已满", "卡已存在": "卡已存在", "锁上面添加密码已满": "锁上面添加密码已满", "密码已存在": "密码已存在", "请输入密码": "请输入密码", "暂无密码,无需重置": "暂无密码,无需重置", - - "真实姓名":"真实姓名", - "身份证号":"身份证号", - "请输入真实姓名":"请输入真实姓名", - "请输入身份证号":"请输入身份证号", - - "点击返回设备配对":"点击返回设备配对", - "无法连接？尝试升级":"无法连接？尝试升级", - "固件升级提示":"固件升级提示", - "请先获取固件文件到手机本地，再选择升级":"请先获取固件文件到手机本地，再选择升级", - "固件升级中":"固件升级中", - "取消升级":"取消升级", - "固件传输中":"固件传输中", - "关闭":"关闭", - "传输中'":"传输中", - "操作记录":"操作记录", - "修改姓名":"修改姓名", - "传输中":"传输中", - "发送人":"发送人", - "发送时间":"发送时间", - "钥匙详情":"钥匙详情", - "姓名":"姓名", - "发送":"发送", - "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确", - "传输期间请勿离开当前页面":"传输期间请勿离开当前页面" - + "真实姓名": "真实姓名", + "身份证号": "身份证号", + "请输入真实姓名": "请输入真实姓名", + "请输入身份证号": "请输入身份证号", + "点击返回设备配对": "点击返回设备配对", + "无法连接？尝试升级": "无法连接？尝试升级", + "固件升级提示": "固件升级提示", + "请先获取固件文件到手机本地，再选择升级": "请先获取固件文件到手机本地，再选择升级", + "固件升级中": "固件升级中", + "取消升级": "取消升级", + "固件传输中": "固件传输中", + "关闭": "关闭", + "传输中'": "传输中", + "操作记录": "操作记录", + "修改姓名": "修改姓名", + "传输中": "传输中", + "发送人": "发送人", + "发送时间": "发送时间", + "钥匙详情": "钥匙详情", + "姓名": "姓名", + "发送": "发送", + "请确认姓名全名和身份证号码是否正确": "请确认姓名全名和身份证号码是否正确", + "传输期间请勿离开当前页面": "传输期间请勿离开当前页面", + "机型": "机型", + "硬件版本": "硬件版本", + "固件版本": "固件版本", + "手动升级": "手动升级", + "设备连接中...": "设备连接中...", + "升级过程中无法开锁，请先开锁后再升级": "升级过程中无法开锁，请先开锁后再升级" } diff --git a/star_lock/lib/blue/blue_manage.dart b/star_lock/lib/blue/blue_manage.dart index 061ea4aa..08c5d768 100644 --- a/star_lock/lib/blue/blue_manage.dart +++ b/star_lock/lib/blue/blue_manage.dart @@ -280,6 +280,17 @@ class BlueManage { } } } + + // String listStr = scanDevices + // // .where((element) => + // // element.advertisementData.advName == 'TMH_dc8f928369ed') + // .map((e) => 'advName:${e.advertisementData.advName} ' + // 'serviceUuids:${e.advertisementData.serviceUuids} ' + // '是否被重置：${e.advertisementData.serviceUuids[0].toString()[31]}') + // .join(',') + // .toString(); + // AppLog.log('--->扫描到的设备 ${listStr} '); + scanDevicesCallBack(scanDevices); // EventBusManager().eventBusFir(scanDevices); // FlutterBluePlus.stopScan(); @@ -364,7 +375,7 @@ class BlueManage { (d.device.platformName == deviceName) || (d.advertisementData.advName == deviceName)); - ScanResult? scanResult;//使用局部变量防止出现缓存 + ScanResult? scanResult; //使用局部变量防止出现缓存 if (knownDeviceIndex >= 0) { // 存在的时候赋值 connectDeviceMacAddress = @@ -381,7 +392,7 @@ class BlueManage { } // AppLog.log("1 connectDeviceId:$connectDeviceMacAddress connectDeviceName:$connectDeviceName"); // stopScan(); - if (scanResult == null ||connectDeviceMacAddress.isEmpty) { + if (scanResult == null || connectDeviceMacAddress.isEmpty) { // connectStateCallBack(BluetoothConnectionState.disconnected!); return; } diff --git a/star_lock/lib/blue/io_reply.dart b/star_lock/lib/blue/io_reply.dart index c8625aeb..d34398c0 100644 --- a/star_lock/lib/blue/io_reply.dart +++ b/star_lock/lib/blue/io_reply.dart @@ -90,7 +90,7 @@ abstract class Reply{ case 0x0e: // 钥匙已存在 showErrorMessage("钥匙已存在"); - AppLog.log("$logTag ${commandType!.typeName} 0x0e 钥匙无效"); + AppLog.log("$logTag ${commandType!.typeName} 0x0e 钥匙已存在"); break; case 0x0f: // 用户已存在 @@ -124,7 +124,7 @@ abstract class Reply{ break; case 0xff: // 异常，未知错误 - AppLog.log("$logTag ${commandType!.typeName} 0xff"); + AppLog.log("$logTag ${commandType!.typeName} 0xff 异常，未知错误"); showErrorMessage("异常，未知错误"); break; default: diff --git a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart index bf9e0363..441778ec 100644 --- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart +++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart @@ -123,10 +123,6 @@ class LockDetailLogic extends BaseGetXController { signKey: signKeyDataList, privateKey: getPrivateKeyList, ); - break; - case 0x07: - //无权限 - break; case 0x16: // 正在开锁中... @@ -138,6 +134,7 @@ class LockDetailLogic extends BaseGetXController { break; default: //失败 + cancelBlueConnetctToastTimer(); break; } } diff --git a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart index 0c37f46c..09766bcd 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart @@ -6,6 +6,7 @@ import 'dart:typed_data'; import 'package:crypto/crypto.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:star_lock/blue/blue_manage.dart'; @@ -18,6 +19,7 @@ import 'package:star_lock/blue/sender_manage.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_logic.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/commonDataManage.dart'; +import 'package:star_lock/tools/showTipView.dart'; import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/widget/permission/permission_dialog.dart'; @@ -67,7 +69,15 @@ class LockEscalationLogic extends BaseGetXController { } String md5Str = md5.convert(otaBin!).toString(); headJson!['fwMd5'] = md5Str; - blueOTAUpgrade(headJson!, [0, 0, 0, 0]); + ShowTipView().showIosTipWithContentDialog("升级过程中无法开锁，请先开锁后再升级".tr, + () async { + blueOTAUpgrade(headJson!, [0, 0, 0, 0]); + EasyLoading.show( + status: '设备连接中...'.tr, maskType: EasyLoadingMaskType.black); + Future.delayed(const Duration(seconds: 4), () { + EasyLoading.dismiss(); + }); + }); } //蓝牙操作 ota 升级 @@ -217,7 +227,7 @@ class LockEscalationLogic extends BaseGetXController { Uint8List bin = data.sublist(binOffset.toInt(), data.length); //md5 校验有问题，暂时不解析 String md5Str = md5.convert(bin).toString().toUpperCase(); - AppLog.log('---> $md5Str ${meta['fwMd5']}'); + AppLog.log('固件 md5 检验md5：$md5Str 固件信息 md5：${meta['fwMd5']}'); if (md5Str != meta['fwMd5']) { showToast('文件校验失败 0x02'.tr); return null; diff --git a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart index 65a81e09..e2dc59d7 100644 --- a/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart @@ -31,136 +31,161 @@ class _LockEscalationPageState extends State { ), body: Container( padding: EdgeInsets.all(30.w), - child: Column( - children: [ - Obx(() { - return logic.state.otaUpdateIng.value - ? PopScope( - canPop: false, - onPopInvoked: (didPop) async { - if (logic.state.otaUpdateIng.value) { - logic.closeOTADAta(); - } - }, - child: const SizedBox(), - ) - : const SizedBox(); - }), - SizedBox( - height: 60.h, - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - 'images/main/icon_main_lockSet_lockEscalation.png', - width: 36.w, - height: 36.w, - ), - SizedBox( - width: 10.w, - ), - Text( - // TranslationLoader.lanKeys!.haveNewVersion!.tr, - "未发现新版本", - style: TextStyle( - fontSize: 24.sp, fontWeight: FontWeight.w600), - ) - ], - ), - SizedBox( - height: 30.h, - ), - Text( - "${TranslationLoader.lanKeys!.currentVersion!.tr}：1.0.0", - style: TextStyle( - fontSize: 18.sp, color: AppColors.darkGrayTextColor), - ), - SizedBox( - height: 40.h, - ), - Obx(() { - return !logic.state.otaUpdateIng.value - ? SubmitBtn( - btnName: TranslationLoader.lanKeys!.upgrade!.tr, - onClick: () {}) - : SizedBox(); - }), - SizedBox( - height: 10.h, - ), - Obx(() { - return !logic.state.otaUpdateIng.value - ? Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - // Container( - // margin: EdgeInsets.only(top: 8, bottom: 8), - // width: Get.width, - // child: Center( - // child: Text( - // // "${TranslationLoader.lanKeys!.newVersion!.tr}：1.0.1", - // "未发现新版本", - // style: TextStyle( - // color: AppColors.mainColor, - // fontSize: 18.sp), - // ), - // ), - // ), - GestureDetector( - onTap: () { - logic.otaUpdate(); - }, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - '手动升级', - style: TextStyle( - color: AppColors.mainColor, - fontSize: 18.sp, - fontWeight: FontWeight.w400), - ), - ), - ) - ], - ) - : Padding( - padding: EdgeInsets.symmetric( - horizontal: 50.w, vertical: 15.h), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - '固件传输中', - style: TextStyle( - color: AppColors.mainColor, - fontSize: 18.sp, - fontWeight: FontWeight.w400), - ), - SizedBox( - width: 10.w, - ), - Expanded( - child: ClipRRect( - borderRadius: BorderRadius.all( - Radius.circular(10.r)), - child: LinearProgressIndicator( - value: logic - .state.otaProgress.value, // 50% 进度 - backgroundColor: Colors.grey[200], - valueColor: - AlwaysStoppedAnimation( - AppColors.mainColor), - ), - ), - ), - ], - ), - ); - }), - ], - ), + child: Obx(() { + return updateView(logic); + }), )); }); } + + Widget updateView(LockEscalationLogic logic) { + if (logic.state.otaUpdateIng.value) { + return otaUpdate(logic); + } + return defaultUpdate(logic); + } + + //升级 + Widget defaultUpdate(LockEscalationLogic logic) { + return Column( + children: [ + SizedBox( + height: 60.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + 'images/main/icon_main_lockSet_lockEscalation.png', + width: 36.w, + height: 36.w, + ), + SizedBox( + width: 10.w, + ), + Text( + // TranslationLoader.lanKeys!.haveNewVersion!.tr, + "未发现新版本", + style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w600), + ) + ], + ), + SizedBox( + height: 30.h, + ), + Text( + "${TranslationLoader.lanKeys!.currentVersion!.tr}：1.0.0", + style: TextStyle(fontSize: 18.sp, color: AppColors.darkGrayTextColor), + ), + SizedBox( + height: 40.h, + ), + Obx(() { + return !logic.state.otaUpdateIng.value + ? SubmitBtn( + btnName: TranslationLoader.lanKeys!.upgrade!.tr, + onClick: () {}) + : SizedBox(); + }), + SizedBox( + height: 10.h, + ), + Align( + alignment: Alignment.topRight, + child: GestureDetector( + onTap: () { + logic.otaUpdate(); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + '手动升级'.tr, + style: TextStyle( + color: AppColors.mainColor, + fontSize: 18.sp, + fontWeight: FontWeight.w400), + ), + ), + ), + ), + ], + ); + } + + //ota升级 + Widget otaUpdate(LockEscalationLogic logic) { + return Column( + children: [ + SizedBox( + height: 20.h, + ), + Text( + '${'机型'.tr}：${logic.headJson?['platform']}-${logic.headJson?['product']}', + style: TextStyle( + color: AppColors.blackColor, + fontSize: 22.sp, + fontWeight: FontWeight.w600), + ), + SizedBox( + height: 10.h, + ), + Text( + '${'硬件版本'.tr}：${logic.headJson?['hwVersion']}', + style: TextStyle( + color: AppColors.blackColor, + fontSize: 22.sp, + fontWeight: FontWeight.w600), + ), + SizedBox( + height: 10.h, + ), + Text( + '${'固件版本'.tr}：${logic.headJson?['fwVersion']}', + style: TextStyle( + color: AppColors.blackColor, + fontSize: 22.sp, + fontWeight: FontWeight.w600), + ), + SizedBox( + height: 20.h, + ), + Text( + '传输期间请勿离开当前页面'.tr, + style: TextStyle( + color: AppColors.blackColor, + fontSize: 20.sp, + fontWeight: FontWeight.w400), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.h), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + '固件传输中', + style: TextStyle( + color: AppColors.mainColor, + fontSize: 18.sp, + fontWeight: FontWeight.w400), + ), + SizedBox( + width: 10.w, + ), + Expanded( + child: ClipRRect( + borderRadius: BorderRadius.all(Radius.circular(10.r)), + child: LinearProgressIndicator( + value: logic.state.otaProgress.value, // 50% 进度 + backgroundColor: Colors.grey[200], + valueColor: + AlwaysStoppedAnimation(AppColors.mainColor), + ), + ), + ), + ], + ), + ), + ], + ); + } } diff --git a/star_lock/lib/mine/addLock/saveLock/saveLock_page.dart b/star_lock/lib/mine/addLock/saveLock/saveLock_page.dart index 4db7b1d6..6e53c6da 100644 --- a/star_lock/lib/mine/addLock/saveLock/saveLock_page.dart +++ b/star_lock/lib/mine/addLock/saveLock/saveLock_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -27,12 +26,17 @@ class _SaveLockPageState extends State with RouteAware { Widget build(BuildContext context) { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, - appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.addLock!.tr, haveBack:true, backgroundColor: AppColors.mainColor), + appBar: TitleAppBar( + barTitle: TranslationLoader.lanKeys!.addLock!.tr, + haveBack: true, + backgroundColor: AppColors.mainColor), body: Column( // mainAxisAlignment: MainAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center, children: [ - SizedBox(height: 80.h,), + SizedBox( + height: 80.h, + ), Container( margin: EdgeInsets.only(left: 50.w, right: 50.w), width: 1.sw, @@ -40,22 +44,29 @@ class _SaveLockPageState extends State with RouteAware { mainAxisAlignment: MainAxisAlignment.center, children: [ Flexible( - child: Text(TranslationLoader.lanKeys!.addSuccessfullyPleaseRename!.tr, style: TextStyle(fontSize: 24.sp, fontWeight: FontWeight.w500)) - ), + child: Text( + TranslationLoader + .lanKeys!.addSuccessfullyPleaseRename!.tr, + style: TextStyle( + fontSize: 24.sp, fontWeight: FontWeight.w500))), ], ), ), - SizedBox(height: 80.h,), + SizedBox( + height: 80.h, + ), Container( height: 80.h, // color: Colors.red, padding: EdgeInsets.only(left: 50.w, right: 50.w), child: TextField( - controller: state.aliNameController, - onChanged: (v){ + focusNode: state.focusNode, + autofocus: true, + controller: state.aliNameController, + onChanged: (v) { state.aliName.value = v; }, - textAlign:TextAlign.center, + textAlign: TextAlign.center, inputFormatters: [ LengthLimitingTextInputFormatter(32), ], @@ -63,58 +74,44 @@ class _SaveLockPageState extends State with RouteAware { decoration: InputDecoration( hintText: '请填写信息'.tr, hintStyle: TextStyle( - // height: 1.1, + // height: 1.1, fontSize: 24.sp, fontWeight: FontWeight.w400, - color: const Color(0xFF999999) - ), + color: const Color(0xFF999999)), border: OutlineInputBorder( - ///设置边框四个角的弧度 borderRadius: BorderRadius.all(Radius.circular(50.h)), - ///用来配置边框的样式 borderSide: BorderSide( - ///设置边框的颜色 color: AppColors.mainColor, - ///设置边框的粗细 width: 1, ), ), - ///用来配置输入框获取焦点时的颜色 focusedBorder: OutlineInputBorder( - ///设置边框四个角的弧度 borderRadius: BorderRadius.all(Radius.circular(50.h)), - ///用来配置边框的样式 borderSide: BorderSide( - ///设置边框的颜色 color: AppColors.mainColor, - ///设置边框的粗细 width: 1, ), ), - ) - ), + )), + ), + SizedBox( + height: 120.h, ), - SizedBox(height: 120.h,), SubmitBtn( btnName: TranslationLoader.lanKeys!.sure!.tr, borderRadius: 20.w, margin: EdgeInsets.only( - left: 50.w, - right: 50.w, - // top: 30.w, - // bottom: 30.w + left: 50.w, + right: 50.w, + // top: 30.w, + // bottom: 30.w ), - padding: EdgeInsets.only( - top: 25.w, - bottom: 25.w - ), - onClick: (){ + padding: EdgeInsets.only(top: 25.w, bottom: 25.w), + onClick: () { logic.addUserConnectBlue(); - } - ), + }), ], - ) - ); + )); } @override @@ -130,6 +127,7 @@ class _SaveLockPageState extends State with RouteAware { void dispose() { // TODO: implement dispose /// 取消路由订阅 + state.focusNode.unfocus(); AppRouteObserver().routeObserver.unsubscribe(this); super.dispose(); BlueManage().stopScan(); diff --git a/star_lock/lib/mine/addLock/saveLock/saveLock_state.dart b/star_lock/lib/mine/addLock/saveLock/saveLock_state.dart index affd16e0..0f316296 100644 --- a/star_lock/lib/mine/addLock/saveLock/saveLock_state.dart +++ b/star_lock/lib/mine/addLock/saveLock/saveLock_state.dart @@ -1,16 +1,15 @@ - import 'package:flutter/material.dart'; import 'package:get/get.dart'; import '../../../blue/blue_manage.dart'; class SaveLockState { - var aliName = ''.obs; - var pwdTimestamp= 0.obs; + var pwdTimestamp = 0.obs; var addressInfo = {}.obs; TextEditingController aliNameController = TextEditingController(); + FocusNode focusNode = FocusNode(); var lockUserNo = 0; var lockInfo = {}; @@ -20,15 +19,16 @@ class SaveLockState { var isFromMap = 0; // 0:不是从地图界面进入 1:从地图界面进入 var ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 - var sureBtnState = 0.obs;// 0可点击 1 不可点击 + var sureBtnState = 0.obs; // 0可点击 1 不可点击 // 管理员密码 var adminPasswordTF = TextEditingController(); + var adminPassword = ''; var lockId = 0; SaveLockState() { - aliName.value = BlueManage().connectDeviceName; + aliName.value = BlueManage().connectDeviceName; aliNameController.text = aliName.value; Map map = Get.arguments; @@ -44,4 +44,4 @@ class SaveLockState { void onClose() { aliNameController.dispose(); } -} \ No newline at end of file +}