322 Commits

Author SHA1 Message Date
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
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
魏少阳
febbab97da 修复蓝牙添加数据问题 2023-12-20 11:54:54 +08:00
Daisy
e258d9b49c 修改音频播放器初始化位置 2023-12-20 09:36:54 +08:00
Daisy
158c37a69e 音频数据 解析播放 2023-12-19 18:41:51 +08:00
魏少阳
a461ae99df Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/lib/talk/call/callTalk.dart
2023-12-19 18:36:58 +08:00
魏少阳
adcb097205 对讲视频图片数据接收渲染 2023-12-19 18:33:02 +08:00
Daisy
9ad097c00c Merge branch 'talk_flutter' of gitee.com:starlock-cn/app-starlock into talk_flutter
# Conflicts:
#	star_lock/lib/talk/call/callTalk.dart
2023-12-18 16:06:05 +08:00
Daisy
4f5e95ce00 711音频数据解析 2023-12-18 16:03:44 +08:00
魏少阳
c2823155b4 调试对讲视频问题 2023-12-18 16:03:05 +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
魏少阳
a0034cc879 Merge branches 'master' and 'master' of gitee.com:starlock-cn/app-starlock 2023-12-18 10:13:02 +08:00
魏少阳
834dfb81b4 提交 2023-12-18 10:12:57 +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
魏少阳
fc36496830 Merge branch 'master' of gitee.com:starlock-cn/app-starlock 2023-12-14 11:40:46 +08:00