1837 Commits

Author SHA1 Message Date
f3e42e3ac8 fix:增加读取h264文件后使用定时器发送,调整html样式 2024-12-12 15:48:15 +08:00
5b2cd50879 fix:增加接听后延迟2秒再启动通话数据检查和预期数据 2024-12-12 11:41:54 +08:00
“DaisyWu”
f9bf6a15bb feat: 补充提交 2024-12-12 10:38:24 +08:00
“DaisyWu”
6cda1953ba Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi
# Conflicts:
#	lib/login/login/starLock_login_page.dart
2024-12-12 10:32:59 +08:00
“DaisyWu”
c6be67cc46 feat: 1,绑定星图配置接口对接及逻辑处理
2,获取个人信息新增星图配置相关未绑定成功校验处理
2024-12-12 10:30:48 +08:00
bb682226af fix:增加html测试 2024-12-12 10:28:03 +08:00
cd63c0924b style:整理星图模块代码 2024-12-11 09:32:51 +08:00
“DaisyWu”
165f9dd080 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-10 18:34:17 +08:00
“DaisyWu”
1e9d68be6e fix: 1,修复接听、挂断铃声未取消问题
2,修复挂断后未退出对讲问题
2024-12-10 18:33:32 +08:00
0f1dc9e666 fix:调整停止播放铃声 2024-12-10 18:26:47 +08:00
“DaisyWu”
343e9c101a fix:修复对讲页面报错问题 2024-12-10 18:07:07 +08:00
17111c7dc3 fix:调整通话中时改为发送通话中挂断消息 2024-12-10 17:46:24 +08:00
c6e9730b43 fix:调整挂断、拒绝后逻辑 2024-12-10 17:32:06 +08:00
9cfccf38c7 fix:调整中继数据的判断方式 2024-12-10 17:27:37 +08:00
92f3b90cb7 fix:调整中继数据的判断方式 2024-12-10 16:31:56 +08:00
de2e09aada fix:调整通话保持的MessageType 2024-12-10 16:31:41 +08:00
e6b89de80c Merge remote-tracking branch 'origin/develop' into develop_liyi 2024-12-10 09:46:19 +08:00
14eb5c448e fix:代码合并 2024-12-10 09:45:50 +08:00
Liuyf
4a368185be Merge branch 'develop_liuyf' into develop 2024-12-09 18:57:14 +08:00
ci_bot
21cc865b14 feat: 配置Debug模式下 xhj,sky证书 2024-12-09 18:47:58 +08:00
Liuyf
a553dfa967 feat: 支持sky,xhj Debug模式下本地调试 2024-12-09 18:45:47 +08:00
魏少阳
5e4a08e803 Merge branch 'develop' into build-addGateway-20240814 2024-12-09 18:22:35 +08:00
魏少阳
7516813a1c fix: 1、修复扭力设置bug。2、星星锁添加万师傅入口。3、添加蓝牙、网关扫描类型区分。4、删除项目中废弃的协议 2024-12-09 18:11:17 +08:00
b723d127f4 Merge remote-tracking branch 'origin/develop_liyi' into develop_liyi 2024-12-09 17:06:14 +08:00
c46115c5b2 fix:去掉better_player依赖 2024-12-09 17:05:20 +08:00
“DaisyWu”
a8fe92e46d Merge branch 'develop' into develop_liyi
# Conflicts:
#	lan/lan_zh.json
2024-12-09 16:04:46 +08:00
“DaisyWu”
fe00a366c7 Merge branch 'develop_liyi' of http://code.star-lock.cn/StarlockTeam/app-starlock into develop_liyi 2024-12-09 15:59:03 +08:00
“DaisyWu”
23a9797e38 feat: 1,新增星图对讲协议逻辑类与原始图片流方式区分隔离处理
2,新增星图对讲接听指令具体细节逻辑处理
2024-12-09 15:58:28 +08:00
3b53a44887 fix:完善状态变更和通知 2024-12-09 15:57:41 +08:00
Liuyf
e1df9e7290 fix: 修复buildconfig和plist不对应问题 2024-12-09 15:09:16 +08:00
Liuyf
34bdf358c4 fix: 修复buildconfig和plist不对应问题 2024-12-09 13:52:14 +08:00
c7d26096fb fix:完善状态变更和通知 2024-12-09 13:44:57 +08:00
Liuyf
23cd12a7b3 ci:构建完成发送企微通知 2024-12-09 13:44:28 +08:00
041c0b7775 fix:完善状态变更和通知 2024-12-09 12:05:34 +08:00
7a9464dfa1 fix:增加eventBus状态通知 2024-12-09 11:47:41 +08:00
86b985c4a4 fix:增加对讲通话状态类 2024-12-09 11:37:27 +08:00
Liuyf
323ed1d868 Merge branch 'develop' into release 2024-12-09 11:14:13 +08:00
Liuyf
77f555249f ci:构建完成发送企微通知 2024-12-09 11:11:35 +08:00
661ba90f08 fix:调整对讲接听逻辑 2024-12-09 11:06:35 +08:00
Liuyf
ad5b729aa8 fix: 提供sky,xhi本地调试配置以及app名称错误配置修复 2024-12-09 11:03:37 +08:00
4e0fdd6f29 fix:增加不同消息类型的对应处理方法 2024-12-09 09:22:58 +08:00
liuyanfeng
3ca337956d ci: 调整预发,联调环境构建配置。 2024-12-08 23:28:45 +08:00
liuyanfeng
2ff73544cc ci: 调整预发,联调环境构建配置。 2024-12-08 22:44:17 +08:00
liuyanfeng
52ff26a9bd ci: 调整预发,联调环境构建配置 2024-12-08 01:58:21 +08:00
liuyanfeng
d7c20001ca fix: remove invalied plist。 2024-12-08 01:51:34 +08:00
liuyanfeng
a09e3cb38e fix: remove invalied plist。. 2024-12-08 01:41:47 +08:00
liuyanfeng
f1f5fe3fd9 fix: remove invalied plist。 2024-12-08 01:23:58 +08:00
liuyanfeng
4b0d55ac56 fix: remove invalied plist. 2024-12-08 00:47:37 +08:00
liuyanfeng
823be1b811 fix: remove invalied plist 2024-12-08 00:45:43 +08:00
liuyanfeng
42bc0acde4 fix: 修复联调,预发布环境打包ipa闪退问题。 2024-12-08 00:19:13 +08:00