魏少阳
|
361162414b
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
# star_lock/lib/common/XSConstantMacro/XSConstantMacro.dart
# star_lock/lib/network/api.dart
# star_lock/lib/network/api_repository.dart
|
2024-02-01 11:24:46 +08:00 |
|
魏少阳
|
3bdd58d620
|
修复邮箱注册、邮箱登录bug
|
2024-02-01 11:22:44 +08:00 |
|
Daisy
|
c2aaed5ba0
|
完善底部添加配件区域
|
2024-01-30 15:34:11 +08:00 |
|
Daisy
|
ca20145ca3
|
锁详情页面新增配件区配置（未完善）
|
2024-01-30 11:18:27 +08:00 |
|
Daisy
|
2ceee5c317
|
移除iOS原生端旧的对讲
|
2024-01-30 10:18:39 +08:00 |
|
Daisy
|
842fcbf557
|
Merge branch 'master' of gitee.com:starlock-cn/app-starlock
# Conflicts:
# star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
# star_lock/lib/network/api.dart
|
2024-01-29 18:01:02 +08:00 |
|
Daisy
|
aab5c82670
|
1，新增部分人脸实体类
2，新增锁详情部分滑动（未完成）
|
2024-01-29 17:57:05 +08:00 |
|
魏少阳
|
ccbe402c01
|
修改普通用户、授权管理员开锁逻辑，修改电子钥匙、授权管理员部分bug
|
2024-01-29 17:23:45 +08:00 |
|
魏少阳
|
918deb65da
|
添加全自动锁连续开锁5S提醒
|
2024-01-26 14:10:57 +08:00 |
|
魏少阳
|
760f0e95ca
|
添加安卓分享，调试消息接口
|
2024-01-24 18:44:34 +08:00 |
|
魏少阳
|
d05f40370c
|
修复密码模块bug
|
2024-01-23 18:37:03 +08:00 |
|
魏少阳
|
9678ff9e90
|
修改考勤模块bug
|
2024-01-19 18:15:42 +08:00 |
|
魏少阳
|
a86588d032
|
1、修复配网bug。2、修复其他问题
|
2024-01-19 11:09:46 +08:00 |
|
魏少阳
|
8c5355dd93
|
1、优化锁设置基本信息功能。2、优化锁设置其他问题
|
2024-01-18 11:25:56 +08:00 |
|
魏少阳
|
62cbd0e570
|
统一Toast
|
2024-01-16 16:52:05 +08:00 |
|
魏少阳
|
4247db112f
|
修复登录uid类型
|
2024-01-16 10:41:08 +08:00 |
|
魏少阳
|
f618546d86
|
提交修复卡、指纹模块bug
|
2024-01-12 19:05:44 +08:00 |
|
魏少阳
|
6e47abd78c
|
修改bug
|
2024-01-11 15:14:02 +08:00 |
|
Daisy
|
e1b9e7ca27
|
Merge branch 'master' of gitee.com:starlock-cn/app-starlock
|
2024-01-09 14:05:39 +08:00 |
|
Daisy
|
8d3b11d548
|
1，新增门锁日志页面类（未完成）
|
2024-01-09 14:05:18 +08:00 |
|
魏少阳
|
e23d241f8c
|
优化蓝牙协议
|
2024-01-09 13:51:35 +08:00 |
|
Daisy
|
b107e19f69
|
监视中开门及音频的处理
|
2024-01-09 11:36:51 +08:00 |
|
魏少阳
|
89710ffcf0
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
|
2024-01-08 17:58:25 +08:00 |
|
魏少阳
|
8c2fdf6d8a
|
完善添加锁流程，添加长按闭锁功能
|
2024-01-08 17:58:19 +08:00 |
|
Daisy
|
e8aabb052a
|
1，解决对讲图片数据有问题时闪现白色错误图片
2，新增监控结束后 停止发送监视请求的计时器
|
2024-01-08 17:56:12 +08:00 |
|
Daisy
|
3cf7449b0e
|
Merge branch 'master' of gitee.com:starlock-cn/app-starlock
# Conflicts:
# star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
|
2024-01-08 11:29:31 +08:00 |
|
Daisy
|
8957756a0f
|
监视部分提交
|
2024-01-08 11:28:22 +08:00 |
|
魏少阳
|
396c750e47
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
|
2024-01-06 16:26:19 +08:00 |
|
魏少阳
|
11aeca1f31
|
优化蓝牙协议，先扫描再连接然后才是发送
|
2024-01-06 16:26:13 +08:00 |
|
Daisy
|
d9c76d8708
|
对讲挂断，结束音频
|
2024-01-06 14:49:44 +08:00 |
|
Daisy
|
dcf9502f48
|
1，新增监视界面连接十秒超时后动画暂停 并可再次点击连接
2，修复1000885--1000904共19个关于密码点击类型未更新造成的问题
|
2024-01-05 14:48:13 +08:00 |
|
魏少阳
|
8f519adede
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
|
2024-01-05 14:00:43 +08:00 |
|
魏少阳
|
264bab98ae
|
优化蓝牙逻辑，添加开锁成功弹窗
|
2024-01-05 13:56:34 +08:00 |
|
Daisy
|
b56c06e406
|
Merge branch 'master' of gitee.com:starlock-cn/app-starlock
|
2024-01-05 09:27:02 +08:00 |
|
Daisy
|
99dfa84b55
|
监控页面优化
|
2024-01-05 09:26:12 +08:00 |
|
魏少阳
|
2b7790f0fe
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
|
2024-01-04 18:27:55 +08:00 |
|
魏少阳
|
2076278df5
|
优化蓝牙通信，蓝牙发送数据无反应
|
2024-01-04 18:27:50 +08:00 |
|
Daisy
|
cf92d6d34c
|
开锁动画优化
|
2024-01-04 16:43:27 +08:00 |
|
Daisy
|
08b71afe96
|
开锁成功弹出框
|
2024-01-04 15:52:47 +08:00 |
|
Daisy
|
22bd7e01b3
|
1，新增开锁成功弹窗
2，监视页面连接动画
|
2024-01-04 11:20:05 +08:00 |
|
魏少阳
|
55c65e4590
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
|
2024-01-03 15:33:59 +08:00 |
|
魏少阳
|
1210ad9110
|
修复问题
|
2024-01-03 15:33:53 +08:00 |
|
Daisy
|
85484ff4ff
|
新增监控页面及连接中动画
|
2024-01-03 15:24:42 +08:00 |
|
魏少阳
|
71d1a3c798
|
Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock
# Conflicts:
# star_lock/lib/blue/blue_manage.dart
# star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_logic.dart
# star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
# star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
# star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart
|
2024-01-02 18:17:05 +08:00 |
|
魏少阳
|
69de4e0ac6
|
重构蓝牙逻辑
|
2024-01-02 18:03:50 +08:00 |
|
Daisy
|
62f3c9fdd3
|
Merge branch 'talk_flutter'
# Conflicts:
# star_lock/ios/Podfile.lock
# star_lock/lib/blue/blue_manage.dart
# star_lock/lib/main.dart
# star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart
# star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
# star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart
# star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart
|
2024-01-02 15:42:41 +08:00 |
|
魏少阳
|
16d5d53c61
|
优化蓝牙功能
|
2023-12-27 10:47:58 +08:00 |
|
魏少阳
|
82b110778d
|
提交代码
|
2023-12-25 10:45:07 +08:00 |
|
Daisy
|
4a131c88f5
|
Merge branch 'master' into talk_flutter
# Conflicts:
# star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart
# star_lock/lib/mine/addLock/saveLock/saveLock_logic.dart
代码合并
|
2023-12-18 10:34:53 +08:00 |
|
魏少阳
|
f212d5dcb1
|
提交代码，给姜总测试
|
2023-12-16 14:31:49 +08:00 |
|