412 Commits

Author SHA1 Message Date
魏少阳
d0d406ff3d Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-26 14:11:02 +08:00
魏少阳
918deb65da 添加全自动锁连续开锁5S提醒 2024-01-26 14:10:57 +08:00
Daisy
88cc26a672 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-25 17:46:51 +08:00
Daisy
108261df9d 优化门锁日志页面布局 2024-01-25 17:46:46 +08:00
魏少阳
42ff84b817 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/network/api_provider.dart
#	star_lock/lib/network/api_repository.dart
2024-01-25 17:42:20 +08:00
魏少阳
42d9d97ade 添加上下拉刷新,修复钥匙功能列表item都能左滑bug,修改无数据高度视图 2024-01-25 17:40:41 +08:00
Daisy
63608b878b 新增商城URL获取接口相关(预发布测试通过) 2024-01-25 15:43:10 +08:00
Daisy
782fbfaa66 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-24 18:51:38 +08:00
Daisy
a5817cffeb 1,新增人脸部分命令协议调试
2,新增人脸相关接口处理 更新人脸信息、删除人脸、清空人脸(未完成)
3,部分人脸详情处理(待完善)
2024-01-24 18:51:18 +08:00
魏少阳
760f0e95ca 添加安卓分享,调试消息接口 2024-01-24 18:44:34 +08:00
魏少阳
6e88b01f6d Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/main/lockDetail/card/addCardType/addCardManage/addCardTypeManage_tabbar.dart
#	star_lock/lib/network/api.dart
2024-01-23 18:42:36 +08:00
魏少阳
d05f40370c 修复密码模块bug 2024-01-23 18:37:03 +08:00
Daisy
64416a6b3a Merge branch 'master' of gitee.com:starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/appRouters.dart
#	star_lock/lib/network/api_repository.dart
2024-01-23 18:26:14 +08:00
Daisy
2b7a351347 1,新增人脸添加相关图片及页面(未完成)
2,新增人脸相关接口(未完成)人脸列表、添加人脸、校验人脸名称是否重复、更新人脸用户接口
3,新增人脸相关协议命令(未完善)
2024-01-23 18:12:51 +08:00
d57361a626 修复错别字 selet2 2024-01-23 17:48:06 +08:00
66730d2c42 修复错别字 lcokSet2 2024-01-23 17:36:02 +08:00
0b57ad1a57 修复错别字 lcokSet 2024-01-23 17:34:37 +08:00
e970a961e9 修复错别字 selet 2024-01-23 17:29:18 +08:00
8718ffed35 修复错别字 2024-01-23 17:21:04 +08:00
9514b7c9d5 隐藏推送日志 2024-01-23 17:19:43 +08:00
de887d5c73 关于页面增加请求地址显示 2024-01-23 17:19:32 +08:00
魏少阳
f314d6fe05 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-19 18:15:47 +08:00
魏少阳
9678ff9e90 修改考勤模块bug 2024-01-19 18:15:42 +08:00
Daisy
95d138f66e Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-19 11:45:54 +08:00
Daisy
7b35099738 新增安卓推送通知(控制台发送测试通过) 2024-01-19 11:45:34 +08:00
魏少阳
a86588d032 1、修复配网bug。2、修复其他问题 2024-01-19 11:09:46 +08:00
Daisy
f435186ca2 安卓部分修改更新 2024-01-18 13:49:19 +08:00
魏少阳
8e57e6e459 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/main/lockDetail/lcokSet/basicInformation/basicInformation/basicInformation_page.dart
#	star_lock/lib/network/api.dart
2024-01-18 11:35:26 +08:00
魏少阳
8c5355dd93 1、优化锁设置基本信息功能。2、优化锁设置其他问题 2024-01-18 11:25:56 +08:00
Daisy
f3a3eb3103 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-18 11:25:40 +08:00
Daisy
c82b3493ca 1,新增TimeLine
2,完善门锁日志页面
2024-01-18 11:24:12 +08:00
a854157111 Merge remote-tracking branch 'origin/master' 2024-01-17 18:43:40 +08:00
4ca79949ed 添加商城示例 2024-01-17 18:43:34 +08:00
Daisy
e93f8624cf 2024-01-12 会议确定去掉部分:提示音、触摸开锁、锁屏、微信二维码、蓝牙广播 已注释并标注 2024-01-17 14:11:10 +08:00
Daisy
0fba9fcf75 剩余提交 2024-01-17 13:58:48 +08:00
Daisy
65667f7b6f Merge branch 'master' of gitee.com:starlock-cn/app-starlock
# Conflicts:
#	star_lock/lib/main.dart
2024-01-17 13:54:08 +08:00
Daisy
485fac6b51 1,新增实时画面页面
2,新增猫眼其他模式查看页面
2024-01-17 13:52:45 +08:00
魏少阳
db4978fbbd 删除多余toast 2024-01-16 16:52:35 +08:00
魏少阳
62cbd0e570 统一Toast 2024-01-16 16:52:05 +08:00
魏少阳
dcabcfc392 优化登录时个人信息本地持久化功能 2024-01-16 15:13:43 +08:00
魏少阳
6bdc2aae12 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-16 10:41:12 +08:00
魏少阳
4247db112f 修复登录uid类型 2024-01-16 10:41:08 +08:00
Daisy
ab4a3c3380 1,receiverUid改为int类型
2,安卓推送放开
2024-01-16 10:11:40 +08:00
Daisy
3a2596e14f 录像时段完善及点击事件处理 2024-01-16 10:08:53 +08:00
魏少阳
0a6259607e Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-12 19:05:49 +08:00
魏少阳
f618546d86 提交修复卡、指纹模块bug 2024-01-12 19:05:44 +08:00
Daisy
61fe70e3ab Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-12 12:00:03 +08:00
Daisy
3a1fb84381 1,监视状态下新增音频数据
2,完善录像时段页面
2024-01-12 11:59:47 +08:00
Daisy
9231f3cef6 1,新增猫眼自定义模式页面
2,新增录像时段页面
2024-01-11 17:29:02 +08:00
魏少阳
4041c9dd83 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-11 15:14:08 +08:00