97 Commits

Author SHA1 Message Date
魏少阳
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
魏少阳
45f7851ca2 完善电子钥匙、卡、指纹bug 2023-12-16 11:20:36 +08:00
魏少阳
6f1fa89db3 修改锁详情弹窗背景色 2023-12-14 11:40:41 +08:00
魏少阳
c140ff3e72 修改详情页蓝牙逻辑 2023-12-14 11:14:56 +08:00
魏少阳
b57c18a9c0 修改卡、指纹模块bug 2023-12-13 17:38:50 +08:00
魏少阳
d8042672a3 卡、指纹、遥控、拆分,修改bug 2023-12-13 11:54:34 +08:00
魏少阳
4cbcd4a536 Flutter添加UDP数据传输 2023-12-11 13:44:15 +08:00
魏少阳
7cc7e834b1 添加部分功能国际化 2023-11-28 13:47:49 +08:00
魏少阳
e972d81599 修改锁设置bug 2023-11-27 09:57:53 +08:00
魏少阳
3623b43797 发布版本星锁 1.0.0.02(preRelease-20231124),修改已知bug 2023-11-24 14:23:36 +08:00
魏少阳
e1c575ca8b Merge branch 'master' of https://gitee.com/weishaoyang/star_lock 2023-11-18 10:38:19 +08:00
魏少阳
8dfd3d717c 完成视频日志、监控模块的UI 2023-11-18 10:38:13 +08:00
Daisy
707ebf9e9f 1,新增APP推送绑定设备ID接口
2,修改APP推送的标志字符串
2023-11-16 10:04:38 +08:00
魏少阳
d3eb981844 Merge branch 'master' of https://gitee.com/weishaoyang/star_lock
# Conflicts:
#	star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart
2023-11-13 11:32:38 +08:00
魏少阳
79c0b74f36 完成分组功能,调试蓝牙协议 2023-11-13 11:28:42 +08:00
Daisy
e63b7eb07f 新增消息提醒模块 2023-11-13 09:47:19 +08:00
Daisy
45cc0801e5 1,新增添加人脸相关
2,新增消息通知相关
2023-11-03 13:57:32 +08:00
Daisy
624eaf258b 1,新增面容开锁相关界面
2,新增猫眼工作模式相关界面
3,新增开门方向设置界面
4,新增电机功率设置页面
5,部分图片补充
2023-11-02 16:12:36 +08:00
魏少阳
181922c6ff Merge branch 'master' of https://gitee.com/weishaoyang/star_lock
# Conflicts:
#	star_lock/ios/Runner.xcodeproj/project.pbxproj
#	star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
2023-11-01 18:01:41 +08:00
魏少阳
3be4a6b45f 添加lockData逻辑,修改bug 2023-11-01 17:28:59 +08:00
Daisy
7f9e8987cb Merge branch 'master' of https://gitee.com/weishaoyang/star_lock 2023-11-01 14:19:08 +08:00
Daisy
556bf841cd 新增iOS端 可视对讲及消息推送 测试完成 2023-11-01 14:18:52 +08:00
魏少阳
58074e7786 修改提出的13个bug 2023-10-25 16:18:27 +08:00
魏少阳
94a20961c2 修改锁列表显示问题、详情锁名字过长显示问题 2023-10-23 09:46:49 +08:00
魏少阳
ed4c02d302 修改开锁动效时间 2023-10-21 15:42:25 +08:00
魏少阳
f1611d1d15 修改开锁失败后提示 2023-10-21 14:27:11 +08:00
魏少阳
bd04a5a9b3 修改删除bug 2023-10-20 14:25:05 +08:00
魏少阳
08e6815d4a 添加开锁动画,修改添加锁地图功能,地址信息非必填 2023-10-20 11:58:40 +08:00