112 Commits

Author SHA1 Message Date
魏少阳
9678ff9e90 修改考勤模块bug 2024-01-19 18:15:42 +08:00
魏少阳
a86588d032 1、修复配网bug。2、修复其他问题 2024-01-19 11:09:46 +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
e93f8624cf 2024-01-12 会议确定去掉部分:提示音、触摸开锁、锁屏、微信二维码、蓝牙广播 已注释并标注 2024-01-17 14:11:10 +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
魏少阳
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
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
魏少阳
6e47abd78c 修改bug 2024-01-11 15:14:02 +08:00
魏少阳
c2fd318087 修复创建公司考勤bug 2024-01-09 18:48:08 +08:00
魏少阳
b92857d193 优化锁设置里面蓝牙连接逻辑 2024-01-09 18:02:02 +08:00
魏少阳
e23d241f8c 优化蓝牙协议 2024-01-09 13:51:35 +08:00
魏少阳
8c2fdf6d8a 完善添加锁流程,添加长按闭锁功能 2024-01-08 17:58:19 +08:00
魏少阳
5434c89b00 优化蓝牙协议,修复udp开锁流程 2024-01-08 11:32:35 +08:00
魏少阳
11aeca1f31 优化蓝牙协议,先扫描再连接然后才是发送 2024-01-06 16:26:13 +08:00
魏少阳
264bab98ae 优化蓝牙逻辑,添加开锁成功弹窗 2024-01-05 13:56:34 +08:00
魏少阳
2076278df5 优化蓝牙通信,蓝牙发送数据无反应 2024-01-04 18:27:50 +08:00
魏少阳
1210ad9110 修复问题 2024-01-03 15:33:53 +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
魏少阳
0225a1c464 锁设置添加注释 2023-12-27 11:09:26 +08:00
魏少阳
16d5d53c61 优化蓝牙功能 2023-12-27 10:47:58 +08:00
魏少阳
b3ee82d605 修复进入自动闭锁界面界面显示问题 2023-12-18 10:56:30 +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
Daisy
3db1afb244 解决时间选择器 确定按钮不显示问题 2023-12-14 10:02:52 +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
魏少阳
8dfd3d717c 完成视频日志、监控模块的UI 2023-11-18 10:38:13 +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
魏少阳
0367cbd27d 合并代码 2023-11-03 14:06:35 +08:00
魏少阳
771a3abb24 提交删除文件 2023-11-03 14:00:12 +08:00
魏少阳
1434a44f78 完善锁设置功能,修复已知bug 2023-11-03 13:58:41 +08:00
Daisy
45cc0801e5 1,新增添加人脸相关
2,新增消息通知相关
2023-11-03 13:57:32 +08:00