|
|
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 |
|
liuyanfeng
|
adbfb67a7b
|
fix: 修复联调，预发布环境打包ipa闪退问题.
|
2024-12-07 15:16:47 +08:00 |
|
liuyanfeng
|
a9cbd37867
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 14:19:59 +08:00 |
|
liuyanfeng
|
2438575ce1
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 14:07:25 +08:00 |
|
liuyanfeng
|
1b38024cb2
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 10:16:26 +08:00 |
|
liuyanfeng
|
64c3209a6d
|
fix: 修复联调，预发布环境打包ipa闪退问题
|
2024-12-07 09:17:51 +08:00 |
|
|
|
13fefa0495
|
fix:增加序列化时判断是请求体还是响应体
|
2024-12-06 15:13:03 +08:00 |
|
Liuyf
|
3a39886b8f
|
other: 重新生成Podfile.lock文件
|
2024-12-06 14:49:02 +08:00 |
|
|
|
298862d153
|
fix:增加测试发送对话请求消息
|
2024-12-06 14:21:51 +08:00 |
|
|
|
a1468b0c3d
|
fix:增加通话数据未收到时定时器判断
|
2024-12-06 13:51:09 +08:00 |
|
|
|
bc57e96150
|
fix:增加通话数据未收到时定时器判断
|
2024-12-06 13:48:15 +08:00 |
|
|
|
dee12e09c1
|
fix:增加通话数据未收到时定时器判断
|
2024-12-06 13:44:17 +08:00 |
|
|
|
6736760d3b
|
fix:增加通话数据未收到时定时器判断
|
2024-12-06 13:38:34 +08:00 |
|
Liuyf
|
c5824f9018
|
other: 补充sky-pre，xhj-preJPUSH_PKGNAME配置
|
2024-12-06 11:02:18 +08:00 |
|
Liuyf
|
3b105f8019
|
Merge branch 'feat_devops' into develop
|
2024-12-06 10:22:01 +08:00 |
|
Liuyf
|
7305e0337f
|
other: 补充sky-pre，xhj-pre地图key
|
2024-12-06 10:21:43 +08:00 |
|
