238 Commits

Author SHA1 Message Date
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
魏少阳
7d32a40f59 提交bug代码 2024-01-03 16:20:55 +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
魏少阳
ef5a7c63fb Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-02 18:17:09 +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
Daisy
956af3446d 1,新增修改密码详情的时间页面及逻辑
2,修复Bug- 1000491 开锁页-密码-密码列表 加上状态显示,比如失效 是红字显示
2024-01-02 18:05:45 +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
Daisy
4297e25b22 1,修复Bug-1000665 开锁页-密码-单次 单次密码不能改,星锁点击有弹出修改密码
2,修复Bug-1000660 开锁页-密码-限时 选择的开始时间是整点,显示却有分钟数
3,修复Bug- 1000658 开锁页-密码-清空码 不可修改,星锁点击修改框弹出
4,修复Bug- 1000649 开锁页-密码-单次-密码详情显示时间错误
5,修复Bug- 1000648 开锁页-密码-清空密码-密码详情显示时间错误
6,修改日期代码重构及参数检查
2024-01-02 15:32:56 +08:00
魏少阳
2723c0b058 优化对讲接收音频 2023-12-29 18:40:02 +08:00
魏少阳
fda85f95a5 优化对讲发送问题 2023-12-29 18:11:36 +08:00
魏少阳
541a19d1a4 优化对讲功能发送音频 2023-12-29 14:28:47 +08:00
魏少阳
4492e75a40 修改对讲发送逻辑 2023-12-27 17:18:20 +08:00
魏少阳
0225a1c464 锁设置添加注释 2023-12-27 11:09:26 +08:00
魏少阳
16d5d53c61 优化蓝牙功能 2023-12-27 10:47:58 +08:00
魏少阳
82b110778d 提交代码 2023-12-25 10:45:07 +08:00
魏少阳
a6773da4fd 提交代码 2023-12-22 14:26:58 +08:00
魏少阳
ae3b80b7b4 修改iOS麦克风权限 2023-12-21 18:25:28 +08:00
魏少阳
05eb47f1d1 添加iOS权限 2023-12-21 17:52:40 +08:00
魏少阳
535d274c6e 完善对讲语音发送功能 2023-12-21 16:48:07 +08:00
魏少阳
81488b599e 修复对讲接收视频bug 2023-12-21 13:56:48 +08:00
魏少阳
5f9e061ee3 Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_page.dart
#	star_lock/lib/main/lockDetail/monitoring/monitoring/lockMonitoring_state.dart
#	star_lock/lib/talk/udp/udp_help.dart
#	star_lock/lib/talk/udp/udp_talkClass.dart
#	star_lock/lib/tools/eventBusEventManage.dart
2023-12-21 10:32:10 +08:00
魏少阳
62b95c6d88 完善对讲功能 2023-12-21 10:21:25 +08:00
Daisy
ca3e9a62c7 新增录音方法(待验证) 2023-12-21 10:18:02 +08:00
Daisy
962c7cfded 解决收到视频数据后加载刷新白屏问题 2023-12-20 16:52:18 +08:00
魏少阳
febbab97da 修复蓝牙添加数据问题 2023-12-20 11:54:54 +08:00
魏少阳
adcb097205 对讲视频图片数据接收渲染 2023-12-19 18:33:02 +08:00
魏少阳
c2823155b4 调试对讲视频问题 2023-12-18 16:03:05 +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
Daisy
1c77010803 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2023-12-18 10:06:07 +08:00
Daisy
7444cee048 删除部分无用代码 2023-12-18 10:05:50 +08:00
魏少阳
f212d5dcb1 提交代码,给姜总测试 2023-12-16 14:31:49 +08:00
魏少阳
fe4b3ebaef Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2023-12-16 11:20:41 +08:00
魏少阳
45f7851ca2 完善电子钥匙、卡、指纹bug 2023-12-16 11:20:36 +08:00
Daisy
99b5327280 有效期页面的生效失效时间判断修改 2023-12-15 15:03:38 +08:00
Daisy
4950c8d8fe 解决生效时间和失效时间无法比较判断生效问题 2023-12-15 14:41:14 +08:00
Daisy
f0a90edb6e 密码详情及电子钥匙详情问题及梳理修改 2023-12-15 11:58:15 +08:00
Daisy
cacf3528e3 解决循环密码参数不合法问题(由于后台需结束日期字段) 2023-12-14 14:33:12 +08:00