21 Commits

Author SHA1 Message Date
魏少阳
debb1bfd40 fix: 合并bugly分支到当前分支 2024-12-04 15:21:27 +08:00
魏少阳
202c97e0d3 Merge branch 'bugly' into build-addGateway-20240814
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/login/login/starLock_login_logic.dart
#	lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
#	lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
#	lib/main/lockDetail/lockDetail/lockDetail_logic.dart
#	lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_logic.dart
#	lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
#	lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
#	lib/mine/mineSet/mineSet/mineSet_logic.dart
#	lib/tools/advancedCalendar/src/widget.dart
#	pubspec.yaml
2024-12-04 14:25:23 +08:00
魏少阳
590d457f68 Merge:merge develop into build-addGateway-20240814 2024-11-26 17:46:54 +08:00
魏少阳
ab1ab37cbd fix: 1、取消锁详情进入操作记录界面就从锁上面拉取记录功能。2、修复操作记录频繁调用接口bug 2024-10-31 17:09:06 +08:00
魏少阳
f082212f92 1、修改开锁页-开锁键-蓝牙开锁成功后有英文弹框
2、修改卡、指纹、人脸-详情、遥控、掌静脉修改姓名 为空,弹框黑无内容问题
3、修改操作记录bug
2024-09-27 10:15:24 +08:00
Liuyf
56e1d4cbff feat: 锁记录数据有效性校正(依据服务器时间) 2024-09-14 18:54:50 +08:00
魏少阳
75c38697b5 星锁项目需要国际化字段已经全部寻找完毕 共1024个 2024-08-21 18:31:19 +08:00
魏少阳
915be9fb52 Merge branch 'release' into International-language+20240725
# Conflicts:
#	.DS_Store
#	lan/lan_zh.json
#	lib/login/login/starLock_login_xhj_page.dart
#	lib/login/register/starLock_register_xhj_page.dart
#	lib/main/lockDetail/lockDetail/lockDetail_page.dart
#	lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart
#	lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart
#	lib/mine/mineSet/hideInvalidUnlockPermissions/hideInvalidUnlockPermissions_page.dart
#	lib/mine/mineSet/mineSet/mineSet_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesHighFunction/valueAddedServicesHighFunction_page.dart
#	lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart
2024-08-14 13:58:08 +08:00
魏少阳
2a66f5e8c5 修改TAPD 优2优bug 2024-08-08 11:00:03 +08:00
魏少阳
7b7e04669b Merge branch 'release' into International-language+20240725 2024-07-27 14:37:09 +08:00
魏少阳
6505ec535a 修改测试部门提出bug 2024-07-27 14:36:35 +08:00
魏少阳
7c2b7f1a2f 统一国际化到常开日期字段 2024-07-26 14:12:26 +08:00
魏少阳
b0dec4471c 修改记录上传添加密码上传问题 2024-07-26 10:03:40 +08:00
魏少阳
f5b79303a8 修改登录、卡、指纹、人脸、遥控国际化 2024-07-25 14:40:02 +08:00
魏少阳
63fa85f5fe 1、添加获取遥控开锁记录问题。2、添加遥控数据同步问题 2024-07-23 15:02:57 +08:00
魏少阳
629b8ca17e 添加遥控模块 2024-07-23 11:16:18 +08:00
魏少阳
3096eb41ef 1、修复开锁之后上传记录密码问题
2、跟陈智讨论数据上传问题,修复数据上传分页问题
3、修复更新锁电量问题
2024-06-11 14:03:48 +08:00
anfe
4c68c60f1d feat:解决硬件多次发数据包的问题 2024-05-21 15:33:06 +08:00
anfe
7d7c795338 feat:提交 git 忽略文件 2024-05-18 09:37:50 +08:00
anfe
a8a61e3711 merge:合并代码 2024-05-18 09:01:31 +08:00
anfe
97df5db110 feat:迁移目录 2024-05-15 10:06:18 +08:00