2944 Commits

Author SHA1 Message Date
Daisy
22bd7e01b3 1,新增开锁成功弹窗
2,监视页面连接动画
2024-01-04 11:20:05 +08:00
魏少阳
db5ab63e55 Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock 2024-01-03 16:21:01 +08:00
魏少阳
7d32a40f59 提交bug代码 2024-01-03 16:20:55 +08:00
Daisy
db8c0dad14 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2024-01-03 15:34:56 +08:00
Daisy
08a08b228a 新增开锁背景图片 2024-01-03 15:34:41 +08:00
Daisy
67ee0d018b 新增挂断后停止接收音频数据(待测试) 2024-01-03 15:34:08 +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
魏少阳
719246ea82 Merge branch 'talk_flutter' of https://gitee.com/starlock-cn/app-starlock into talk_flutter 2023-12-29 18:11:44 +08:00
魏少阳
fda85f95a5 优化对讲发送问题 2023-12-29 18:11:36 +08:00
Daisy
0c5e71f231 音频播放测试通过 2023-12-29 18:10:22 +08:00
Daisy
b8a2c78836 Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/pubspec.yaml
2023-12-29 14:32:49 +08:00
Daisy
286fce3c09 pcm音频播放插件提交 2023-12-29 14:31:25 +08:00
魏少阳
541a19d1a4 优化对讲功能发送音频 2023-12-29 14:28:47 +08:00
魏少阳
4e2dfece37 Merge branch 'talk_flutter' of https://gitee.com/starlock-cn/app-starlock into talk_flutter 2023-12-27 17:18:25 +08:00
魏少阳
4492e75a40 修改对讲发送逻辑 2023-12-27 17:18:20 +08:00
Daisy
d830165402 提交流格式播放代码 2023-12-27 17:16:58 +08:00
Daisy
9848852f9f 播放暂存 2023-12-27 13:59:11 +08:00
魏少阳
0225a1c464 锁设置添加注释 2023-12-27 11:09:26 +08:00
魏少阳
16d5d53c61 优化蓝牙功能 2023-12-27 10:47:58 +08:00
Daisy
1806c15c2f 删除无用代码,main函数测试播放711音频数据成功暂存 2023-12-26 16:34:30 +08:00
Daisy
2aa56b65de Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/lib/talk/call/callTalk.dart
2023-12-26 16:30:56 +08:00
Daisy
3d0dc3074f 提交测试711音频播放成功 2023-12-26 16:30:06 +08:00
魏少阳
82b110778d 提交代码 2023-12-25 10:45:07 +08:00
魏少阳
01f5b67375 Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/lib/talk/call/callTalk.dart
2023-12-22 14:30:33 +08:00
魏少阳
a6773da4fd 提交代码 2023-12-22 14:26:58 +08:00
Daisy
a9dfd3f847 g711编解码方法修改 2023-12-22 14:22:34 +08:00
魏少阳
ae3b80b7b4 修改iOS麦克风权限 2023-12-21 18:25:28 +08:00
魏少阳
c403a87ae2 Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter 2023-12-21 17:52:45 +08:00
魏少阳
05eb47f1d1 添加iOS权限 2023-12-21 17:52:40 +08:00
Daisy
143ccd69bd 新增pcm转711方法 2023-12-21 17:41:06 +08:00
魏少阳
535d274c6e 完善对讲语音发送功能 2023-12-21 16:48:07 +08:00
魏少阳
5a5f8ea42f Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter 2023-12-21 13:56:53 +08:00
魏少阳
81488b599e 修复对讲接收视频bug 2023-12-21 13:56:48 +08:00
Daisy
21d7902b7f 修改G711解码方式
新增G711编码类
2023-12-21 11:59:10 +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
Daisy
c87d2f96b0 Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter 2023-12-20 13:46:26 +08:00
Daisy
5b4a4bb53c 删除无用代码 2023-12-20 13:46:05 +08:00
魏少阳
597ff218a9 提交代码 2023-12-20 13:43:41 +08:00