2826 Commits

Author SHA1 Message Date
4f522919af Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!218
2025-07-23 06:08:05 +00:00
5e29e2c780 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!217
2025-07-23 05:35:10 +00:00
41c4623876 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!216
2025-07-23 03:38:22 +00:00
5e1d1bd0c1 fix:修复无法搜索到网关的问题 2025-07-23 11:33:42 +08:00
139d16387c fix:修复无法搜索到网关的问题 2025-07-23 10:58:03 +08:00
22956365f0 Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!215
2025-07-23 02:44:25 +00:00
9cf543d638 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!214
2025-07-23 02:20:18 +00:00
768f7fd38f Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!213
2025-07-23 01:55:25 +00:00
4045adf0b2 fix:增加添加锁时选择语音包的页面 2025-07-23 09:52:58 +08:00
b2952b3c72 fix:增加添加锁时配置语音包的页面 2025-07-18 10:40:41 +08:00
ccad385a80 fix:调整语音包设置 2025-07-17 14:56:56 +08:00
30cb3a7ac3 fix:恢复对讲请求消息payload内容 2025-07-16 18:01:07 +08:00
e2dc776fd1 fix:设置语言包之后同步锁设置信息 2025-07-15 15:07:32 +08:00
dd0e7fd1f1 Merge branch 'release_sky' into 'canary_release_sky'
Release sky

See merge request StarlockTeam/app-starlock!202
2025-07-14 01:11:54 +00:00
c221e2cbdf fix:推出对讲页时停止发送期望数据 2025-07-12 15:51:05 +08:00
2feb1fb2fc fix:调整配网后及时更新锁设置 2025-07-12 15:50:31 +08:00
95325f3a39 fix:增加云存webview的支付页面、增加语音包设置模块 2025-07-12 15:50:03 +08:00
dc5bfdb756 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!200
2025-07-11 01:07:24 +00:00
1bdfc43b53 Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!199
2025-07-09 03:46:04 +00:00
f09e0bf329 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!198
2025-07-09 03:36:58 +00:00
25ed80e4ba fix:调整对讲解码插件版本 2025-07-09 11:36:30 +08:00
4bae1d1e98 fix:ios环境下打开应用时获取VoIPToken 2025-07-09 11:23:46 +08:00
6f1f1e44cd Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!196
2025-07-04 01:14:38 +00:00
c98772c806 Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!195
2025-07-03 09:21:28 +00:00
5e14f217ea Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整VoIP上报的结构

See merge request StarlockTeam/app-starlock!194
2025-07-03 09:12:21 +00:00
4a3a228a80 fix:调整VoIP上报的结构 2025-07-03 17:10:12 +08:00
72d451268e Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!193
2025-07-03 07:32:15 +00:00
41fdae21f8 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios编译宏

See merge request StarlockTeam/app-starlock!192
2025-07-03 07:23:14 +00:00
4fd5449e3e fix:调整ios编译宏 2025-07-03 15:22:12 +08:00
f55e69c67f Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!191
2025-07-03 07:06:51 +00:00
38391a4f12 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios编译宏

See merge request StarlockTeam/app-starlock!190
2025-07-03 06:43:12 +00:00
d4d04140ce fix:调整ios编译宏 2025-07-03 14:42:05 +08:00
e983540b79 Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!189
2025-07-03 03:41:34 +00:00
2956b25d54 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加国内环境下不上报VoIP;调整Fastlin中的环境

See merge request StarlockTeam/app-starlock!188
2025-07-03 03:31:52 +00:00
2571d95c99 fix:增加国内环境下不上报VoIP;调整Fastlin中的环境 2025-07-03 11:30:56 +08:00
20c7b5ba9b Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!187
2025-07-02 10:05:24 +00:00
c7c1730cb0 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!186
2025-07-02 09:14:39 +00:00
87905dacb7 fix:调整为callkit实现 2025-07-02 17:13:05 +08:00
4e08f57c48 fix:调整为callkit实现 2025-07-02 17:11:39 +08:00
2ab2a48f02 fix:voip收到推送使用livecommunicationkit触发推送实现备份 2025-07-01 14:22:57 +08:00
517b6b6734 fix:voip收到推送的基础功能增加 2025-06-30 17:17:07 +08:00
507ba73fa9 Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!184
2025-06-26 01:55:03 +00:00
822bf89a2c Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整ios解码流程

See merge request StarlockTeam/app-starlock!183
2025-06-26 01:41:33 +00:00
d3df44dd87 fix:调整ios解码流程 2025-06-26 09:40:15 +08:00
61b7041e71 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!182
2025-06-25 10:51:05 +00:00
75dbbc93d1 fix:调整兼容ios的对讲解码流程 2025-06-25 18:49:29 +08:00
9acb5f4cce fix:调整兼容ios的对讲解码流程 2025-06-25 18:48:31 +08:00
b506e679da Merge branch 'develop_sky' into 'release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!180
2025-06-24 08:01:48 +00:00
e04fb1adbc Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky

See merge request StarlockTeam/app-starlock!179
2025-06-23 08:29:51 +00:00
a98fc0b905 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整解码插件版本、静态资源目录

See merge request StarlockTeam/app-starlock!178
2025-06-23 08:17:47 +00:00